From 0eec68b82972582f1da95f677a708ee8471a9c3e Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Sat, 23 Nov 2002 04:25:33 +0000
Subject: [PATCH] fixed bug 633314

---
 docs/upgrades/upgrade_4.8.0-4.9.0.sql |  2 ++
 lib/WebGUI/Form.pm                    |  2 +-
 lib/WebGUI/Operation/Account.pm       | 15 +++++++++++++--
 lib/WebGUI/Wobject/Article.pm         |  3 ++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/upgrades/upgrade_4.8.0-4.9.0.sql b/docs/upgrades/upgrade_4.8.0-4.9.0.sql
index 69eac72e4..dfff47efb 100644
--- a/docs/upgrades/upgrade_4.8.0-4.9.0.sql
+++ b/docs/upgrades/upgrade_4.8.0-4.9.0.sql
@@ -8,6 +8,8 @@ alter table users drop column ldapURL;
 alter table users drop column connectDN;
 insert into international (internationalId,languageId,namespace,message,lastUpdated) values (814,1,'WebGUI','Back to styles.', 1038022043);
 alter table collateral change parameters parameters text;
+insert into international (internationalId,languageId,namespace,message,lastUpdated) values (815,1,'WebGUI','The file you tried to upload is too large.', 1038023800);
+
 
 
 
diff --git a/lib/WebGUI/Form.pm b/lib/WebGUI/Form.pm
index 27c41e5eb..26cd0364d 100644
--- a/lib/WebGUI/Form.pm
+++ b/lib/WebGUI/Form.pm
@@ -869,7 +869,7 @@ sub password {
 
 sub phone {
         my ($maxLength);
-        $maxLength = shift || 30;
+        $maxLength = $_[0]->{maxLength} || 30;
 	return text({
 		name=>$_[0]->{name},
 		maxlength=>$maxLength,
diff --git a/lib/WebGUI/Operation/Account.pm b/lib/WebGUI/Operation/Account.pm
index 601002772..fb7572283 100644
--- a/lib/WebGUI/Operation/Account.pm
+++ b/lib/WebGUI/Operation/Account.pm
@@ -360,12 +360,23 @@ sub www_editProfile {
 					} else {
 						$default = eval $data{dataDefault};
 					}
-                                        $f->select($data{fieldName},$values,$label,$default,'','','',$subtext);
+                                        $f->select(
+						-name=>$data{fieldName},
+						-options=>$values,
+						-label=>$label,
+						-value=>$default,
+						-subtext=>$subtext
+						);
                                 } else {
                                         $default = $session{form}{$data{fieldName}}
                                                 || $session{user}{$data{fieldName}}
                                                 || eval $data{dataDefault};
-                                        $f->$method($data{fieldName},$label,$default,'','',$subtext);
+                                        $f->$method(
+						-name=>$data{fieldName},
+						-label=>$label,
+						-value=>$default,
+						-subtext=>$subtext
+						);
                                 }
                                 $previousCategory = $category;
                         }
diff --git a/lib/WebGUI/Wobject/Article.pm b/lib/WebGUI/Wobject/Article.pm
index 6f93e6cc4..05aa74e8a 100644
--- a/lib/WebGUI/Wobject/Article.pm
+++ b/lib/WebGUI/Wobject/Article.pm
@@ -116,6 +116,7 @@ sub www_edit {
 #-------------------------------------------------------------------
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
+#	return WebGUI::International::get(815).$_[0]->www_edit if ($session{cgi}->cgi_error eq "413 POST too large");
         my ($image, $attachment, %property);
 	$_[0]->SUPER::www_editSave() if ($_[0]->get("wobjectId") eq "new");
         $image = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
@@ -130,7 +131,7 @@ sub www_editSave {
 	$property{linkURL} = $session{form}{linkURL};
 	$property{allowDiscussion} = $session{form}{allowDiscussion};
 	$_[0]->SUPER::www_editSave(\%property);
-        return "";
+       	return "";
 }
 
 #-------------------------------------------------------------------