Fixing a backporting mistake (Bug #1384497)

Older versions handle the check_upgrades() output
differently

Change-Id: I7b847d814a504ea4a15f1c7b8a1a9e5d008299bf
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

htdocs/lib/upgrade.php

@@ -49,10 +49,6 @@ function check_upgrades($name=null) {
         catch (Exception $e) {
             $coreversion = 0;
         }
-        $core = new stdClass();
-        $core->to = $config->version;
-        $core->torelease = $config->release;
-        $core->toseries = $config->series;
         if (empty($coreversion)) {
             if (is_mysql()) { // Show a more informative error message if using mysql with skip-innodb
                 // In MySQL 5.6.x, we run the command 'SHOW ENGINES' to check if InnoDB is enabled or not
@@ -71,7 +67,12 @@ function check_upgrades($name=null) {
                     throw new ConfigSanityException("Mahara requires InnoDB tables.  Please ensure InnoDB tables are enabled in your MySQL server.");
                 }
             }
+            $core = new stdClass();
             $core->install = true;
+            $core->to = $config->version;
+            $core->torelease = $config->release;
+            $core->toseries = $config->series;
+            $toupgrade['core'] = $core;
             $installing = true;
         }
         else if ($config->version > $coreversion) {
@@ -82,11 +83,15 @@ function check_upgrades($name=null) {
                                           . "($config->minupgraderelease) first "
                                           . " (you have $coreversion ($corerelease)");
             }
+            $core = new stdClass();
             $core->upgrade = true;
             $core->from = $coreversion;
             $core->fromrelease = $corerelease;
+            $core->to = $config->version;
+            $core->torelease = $config->release;
+            $core->toseries = $config->series;
+            $toupgrade['core'] = $core;
         }
-        $toupgrade['core'] = $core;
     }
 
     // If we were just checking if the core needed to be upgraded, we can stop here