Changeset 24448

Timestamp:

07/07/08 10:08:59 (6 months ago)

Author:

markwest

Message:

Fixed #30 - upgrade.php should check database connection

Location:

branches/zikula-1.0

Files:

• includes/pnAPI.php (modified) (1 diff)
• upgrade.php (modified) (2 diffs)

branches/zikula-1.0/includes/pnAPI.php

@@ -311 +311 @@
                 }
                 pnShutDown();
+            } else {
+                return false;
             }
         }

branches/zikula-1.0/upgrade.php

@@ -55 +55 @@
 if ($action === 'regenerate' || $action === 'install' || $action === 'upgrademodules') {
     include 'includes/pnAPI.php';
-    pnInit(PN_CORE_ALL & ~PN_CORE_TOOLS & ~PN_CORE_DECODEURLS & ~PN_CORE_SESSIONS);
-    
+    if (!pnInit(PN_CORE_ALL & ~PN_CORE_TOOLS & ~PN_CORE_DECODEURLS & ~PN_CORE_SESSIONS)) {
+        Loader::requireOnce('includes/templates/dbconnectionerror.htm');
+        pnShutDown();
+    }
+
     $username = FormUtil::getPassedValue('username');
     $password = FormUtil::getPassedValue('password');
@@ -137 +140 @@
     $_SESSION['_PNUpgrader']['_PNUpgradeFrom76x'] = true;
     include 'includes/pnAPI.php';
-    pnInit(PN_CORE_ALL & ~PN_CORE_THEME & ~PN_CORE_AJAX & ~PN_CORE_SESSIONS & ~PN_CORE_TOOLS);
+    if (!pnInit(PN_CORE_ALL & ~PN_CORE_THEME & ~PN_CORE_AJAX & ~PN_CORE_SESSIONS & ~PN_CORE_TOOLS)) {
+        Loader::requireOnce('includes/templates/dbconnectionerror.htm');
+        pnShutDown();
+    }
 
     _upg_header();