From 07aa610a8f7e67dd03673e978d2101049f51eab0 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 13 May 2003 01:20:11 +0000
Subject: [PATCH] merging 5.2.6 bug fixes

---
 docs/credits.txt                                   |  1 +
 docs/upgrades/upgrade_5.2.5-5.2.6.sql              |  4 ++++
 ...grade_5.2.5-5.3.0.pl => upgrade_5.2.6-5.3.0.pl} |  0
 ...ade_5.2.5-5.3.0.sql => upgrade_5.2.6-5.3.0.sql} |  0
 lib/WebGUI/Operation/Settings.pm                   | 14 +++++++-------
 5 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 docs/upgrades/upgrade_5.2.5-5.2.6.sql
 rename docs/upgrades/{upgrade_5.2.5-5.3.0.pl => upgrade_5.2.6-5.3.0.pl} (100%)
 rename docs/upgrades/{upgrade_5.2.5-5.3.0.sql => upgrade_5.2.6-5.3.0.sql} (100%)

diff --git a/docs/credits.txt b/docs/credits.txt
index 3cbb33d17..380f861bc 100644
--- a/docs/credits.txt
+++ b/docs/credits.txt
@@ -36,6 +36,7 @@ Contributing Translators.............AGOFER Ltda.
                                      Natalia Almazova
                                      Joeri de Bruin / ProcoliX
                                      Jose Caneira
+                                     Junying Du / WDI
                                      Andreas Graf
                                      Emiliano Grilli / Webopen
                                      Ehab Heikal
diff --git a/docs/upgrades/upgrade_5.2.5-5.2.6.sql b/docs/upgrades/upgrade_5.2.5-5.2.6.sql
new file mode 100644
index 000000000..5e3ab6180
--- /dev/null
+++ b/docs/upgrades/upgrade_5.2.5-5.2.6.sql
@@ -0,0 +1,4 @@
+insert into webguiVersion values ('5.2.6','upgrade',unix_timestamp());
+update language set language='&#32321;&#20307;&#20013;&#25991; (Chinese Traditional)' where languageId=9;
+update language set language='&#31616;&#20307;&#20013;&#25991; (Chinese Simplified)' where languageId=7;
+
diff --git a/docs/upgrades/upgrade_5.2.5-5.3.0.pl b/docs/upgrades/upgrade_5.2.6-5.3.0.pl
similarity index 100%
rename from docs/upgrades/upgrade_5.2.5-5.3.0.pl
rename to docs/upgrades/upgrade_5.2.6-5.3.0.pl
diff --git a/docs/upgrades/upgrade_5.2.5-5.3.0.sql b/docs/upgrades/upgrade_5.2.6-5.3.0.sql
similarity index 100%
rename from docs/upgrades/upgrade_5.2.5-5.3.0.sql
rename to docs/upgrades/upgrade_5.2.6-5.3.0.sql
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index 54893a183..31b373c19 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -38,7 +38,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_editUserSettings {
-	WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
         my ($output, $f, $cmd, $html, $options);
         $output .= helpIcon(2);
         $output .= '<h1>'.WebGUI::International::get(117).'</h1>';
@@ -64,7 +64,7 @@ sub www_editUserSettings {
 
 #-------------------------------------------------------------------
 sub www_editCompanyInformation {
-	WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
         my ($output, $f);
         $output .= helpIcon(6);
 	$output .= '<h1>'.WebGUI::International::get(124).'</h1>';
@@ -80,7 +80,7 @@ sub www_editCompanyInformation {
 
 #-------------------------------------------------------------------
 sub www_editContentSettings {
-	WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
         my ($output, %htmlFilter, $f, $pages);
 	$pages = WebGUI::SQL->buildHashRef("select pageId,menuTitle from page order by menuTitle");
         %htmlFilter = ('none'=>WebGUI::International::get(420), 'most'=>WebGUI::International::get(421), 
@@ -130,7 +130,7 @@ sub www_editContentSettings {
 
 #-------------------------------------------------------------------
 sub www_editMessagingSettings {
-	WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
         my ($output, $f);
         $output .= helpIcon(13);
         $output .= '<h1>'.WebGUI::International::get(133).'</h1>';
@@ -147,7 +147,7 @@ sub www_editMessagingSettings {
 
 #-------------------------------------------------------------------
 sub www_editMiscSettings {
-	WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
         my ($output, $f);
         $output .= helpIcon(24);
         $output .= '<h1>'.WebGUI::International::get(140).'</h1>';
@@ -163,7 +163,7 @@ sub www_editMiscSettings {
 
 #-------------------------------------------------------------------
 sub www_manageSettings {
-	WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
         my ($output);
         $output .= helpIcon(12);
         $output .= '<h1>'.WebGUI::International::get(143).'</h1>';
@@ -180,7 +180,7 @@ sub www_manageSettings {
 
 #-------------------------------------------------------------------
 sub www_saveSettings {
-	WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
+	return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
 	my ($key, $value);
 	foreach $key (keys %{$session{form}}) {
 		$value = $session{form}{$key};