]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Don't say the db was upgradeded when it wasn't.
authorBrett Profitt <brett.profitt@gmail.com>
Sun, 26 Jun 2011 00:53:13 +0000 (20:53 -0400)
committerBrett Profitt <brett.profitt@gmail.com>
Sun, 26 Jun 2011 00:53:13 +0000 (20:53 -0400)
engine/lib/deprecated-1.8.php

index d92257a092feb90dde5e594ec3bbc41f45469970..ff4fa0756aa4ba1204ea25d2a374f05b5e65e837 100644 (file)
@@ -20,7 +20,7 @@
  * @param string $fromdir Optional directory to load upgrades from. default: engine/schema/upgrades/
  * @param bool   $quiet   If true, suppress all error messages. Only use for the upgrade from <=1.6.
  *
- * @return bool
+ * @return int The number of upgrades run.
  * @see upgrade.php
  * @see version.php
  * @deprecated 1.8 Use PHP upgrades for sql changes.
@@ -35,6 +35,8 @@ function db_upgrade($version, $fromdir = "", $quiet = FALSE) {
        if (!$fromdir) {
                $fromdir = $CONFIG->path . 'engine/schema/upgrades/';
        }
+       
+       $i = 0;
 
        if ($handle = opendir($fromdir)) {
                $sqlupgrades = array();
@@ -65,11 +67,12 @@ function db_upgrade($version, $fromdir = "", $quiet = FALSE) {
                                } else {
                                        run_sql_script($fromdir . $sqlfile);
                                }
+                               $i++;
                        }
                }
        }
 
-       return TRUE;
+       return $i;
 }
 
 /**