Merge "Fix check to see if element is there already."

[lhc/web/wiklou.git] / includes / installer / DatabaseUpdater.php

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 312b796..dde2193 100644 (file)
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -321,9 +321,10 @@ abstract class DatabaseUpdater {
                foreach( $updates as $funcList ) {
                        $func = $funcList[0];
                        $arg = $funcList[1];
+                       $origParams = $funcList[2];
                        $ret = call_user_func_array( $func, $arg );
                        flush();
-                       $this->updatesSkipped[] = $arg;
+                       $this->updatesSkipped[] = $origParams;
                }
        }
 
@@ -380,6 +381,7 @@ abstract class DatabaseUpdater {
                $updatesDone = array();
                $updatesSkipped = array();
                foreach ( $updates as $params ) {
+                       $origParams = $params;
                        $func = array_shift( $params );
                        if( !is_array( $func ) && method_exists( $this, $func ) ) {
                                $func = array( $this, $func );
@@ -389,9 +391,9 @@ abstract class DatabaseUpdater {
                        $ret = call_user_func_array( $func, $params );
                        flush();
                        if( $ret !== false ) {
-                               $updatesDone[] = $params;
+                               $updatesDone[] = $origParams;
                        } else {
-                               $updatesSkipped[] = array( $func, $params );
+                               $updatesSkipped[] = array( $func, $params, $origParams );
                        }
                }
                $this->updatesSkipped = array_merge( $this->updatesSkipped, $updatesSkipped );
@@ -719,8 +721,8 @@ abstract class DatabaseUpdater {
                } elseif( $this->updateRowExists( $updateKey ) ) {
                        $this->output( "...$field in table $table already modified by patch $patch.\n" );
                } else {
-                       return $this->applyPatch( $patch, $fullpath, "Modifying $field field of table $table" );
                        $this->insertUpdateRow( $updateKey );
+                       return $this->applyPatch( $patch, $fullpath, "Modifying $field field of table $table" );
                }
                return true;
        }
@@ -815,7 +817,7 @@ abstract class DatabaseUpdater {
        protected function doUpdateTranscacheField() {
                if ( $this->updateRowExists( 'convert transcache field' ) ) {
                        $this->output( "...transcache tc_time already converted.\n" );
-                       return;
+                       return true;
                }
 
                return $this->applyPatch( 'patch-tc-timestamp.sql', false,