* [MOD] Minor tweaks.

nuxsmin · Dec 26, 2015 · 35e8cd9 · 35e8cd9
1 parent 6ce7ade
commit 35e8cd9
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/inc/Init.class.php b/inc/Init.class.php
@@ -213,7 +213,9 @@ public static function setIncludes()
     public static function loadClass($class)
     {
         // Eliminar \\ para las clases con namespace definido
-        $class = (strripos($class, '\\')) ? substr($class, strripos($class, '\\') + 1) : $class;
+        if (strripos($class, '\\')) {
+            $class = substr($class, strripos($class, '\\') + 1);
+        }
 
         // Buscar la clase en los directorios de include
         foreach (explode(PATH_SEPARATOR, get_include_path()) as $includePath) {
@@ -543,11 +545,10 @@ private static function checkVersion()
                 $hash = Request::analyze('h');
 
                 if ($action === 'upgrade' && $hash === Config::getValue('upgrade_key', 0)) {
-                    if (Upgrade::doUpgrade($databaseVersion)) {
+                    if ($update = Upgrade::doUpgrade($databaseVersion)) {
                         ConfigDB::setValue('version', $appVersion);
                         Config::setValue('maintenance', false);
                         Config::deleteParam('upgrade_key');
-                        $update = true;
                     }
                 } else {
                     $controller = new Controller\MainC();