[evolvis-commits] r18374: theme-evolvis pending merges:↵ Thorsten Glaser 2012-04-24 fix mixup with success/error stati

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Apr 24 16:35:06 CEST 2012


Author: mirabilos
Date: 2012-04-24 16:35:05 +0200 (Tue, 24 Apr 2012)
New Revision: 18374

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/www/account/setlang.php
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/EvStyle.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/Theme.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/evolvis/evolvis.css
Log:
theme-evolvis pending merges:
  Thorsten Glaser 2012-04-24 fix mixup with success/error stati

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/account/setlang.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/account/setlang.php	2012-04-24 14:35:02 UTC (rev 18373)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/account/setlang.php	2012-04-24 14:35:05 UTC (rev 18374)
@@ -56,7 +56,7 @@
 		$language_id,
 		user_getid(),
 	    ));
-	$force = db_affected_rows($result) == 1 ? 2 : 1;
+	$force = (db_affected_rows($res) == 1) ? 2 : 1;
 } else {
 	$force = 0;
 }
@@ -76,10 +76,10 @@
 case 0:
 	echo '<p>' . _('Your account preferences – if you are a registered user on the site – have not been changed.') . "</p>\n";
 	break;
-case 1:
+case 2:
 	echo '<p>' . _('Your account settings have also been changed to the new language.') . "</p>\n";
 	break;
-case 2:
+case 1:
 	echo '<p>' . _('Your account settings could not be changed due to an error.') . "</p>\n";
 	echo "<hr />\n";
 	$account_from_setlang = true;



More information about the evolvis-commits mailing list