[Jaws-commits] r12505 - in branches/0.8/html: install/stages upgrade/stages

afz at jaws-project.com afz at jaws-project.com
Fri Jan 27 21:57:41 UTC 2012


Author: afz
Date: 2012-01-27 21:57:41 +0000 (Fri, 27 Jan 2012)
New Revision: 12505

Modified:
   branches/0.8/html/install/stages/Database.php
   branches/0.8/html/upgrade/stages/0815To0816.php
Log:
updated setting of auth_method in install/upgrade stuffs

Modified: branches/0.8/html/install/stages/Database.php
===================================================================
--- branches/0.8/html/install/stages/Database.php	2012-01-27 21:52:59 UTC (rev 12504)
+++ branches/0.8/html/install/stages/Database.php	2012-01-27 21:57:41 UTC (rev 12505)
@@ -378,7 +378,7 @@
                     array('/config/frontend_ajaxed', 'false'),
                     array('/config/http_auth', 'false'),
                     array('/config/realm', 'Jaws Control Panel'),
-                    array('/config/auth_method', 'DefaultAuthentication'),
+                    array('/config/auth_method', 'Default'),
                     array('/config/key', $uniqueKey),
                     array('/config/theme', 'jaws'),
                     array('/config/date_format', 'd MN Y'),
@@ -467,9 +467,6 @@
             //return new Jaws_Error(_t('GLOBAL_ERROR_FAILED_ADDING_REGISTRY_KEY'), 'CORE');
         }
 
-        //-- if user enterd incorrect authentication method, after reinstall we set it to default.
-        $GLOBALS['app']->Registry->Set('/config/auth_method', 'DefaultAuthentication');
-
         // Commit the changes so they get saved
         $GLOBALS['app']->Registry->commit('core');
 

Modified: branches/0.8/html/upgrade/stages/0815To0816.php
===================================================================
--- branches/0.8/html/upgrade/stages/0815To0816.php	2012-01-27 21:52:59 UTC (rev 12504)
+++ branches/0.8/html/upgrade/stages/0815To0816.php	2012-01-27 21:57:41 UTC (rev 12505)
@@ -131,6 +131,7 @@
         $GLOBALS['app']->Registry->NewKey('/config/site_email',  $gate_email);
         $GLOBALS['app']->Registry->DeleteKey('/network/site_email');
         $GLOBALS['app']->Registry->DeleteKey('/network/email_name');
+        $GLOBALS['app']->Registry->Set('/config/auth_method', 'Default');
         $GLOBALS['app']->Registry->Set('/version', JAWS_VERSION);
         $GLOBALS['app']->Registry->Set('/last_update', $timestamp);
 



More information about the Jaws-commits mailing list