diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-01-07 11:02:31 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-01-07 11:02:31 +0100 |
| commit | 1b4bad6583ffa8a7ba8a1e7f5f9c29c5654bba99 (patch) | |
| tree | d70037f3f547a71e4a6b87bcddb31aeb19db7328 /phpBB/phpbb/db/migrator.php | |
| parent | 3ae016954212e90032a10d1427c34a4ff9d9637c (diff) | |
| parent | 182a96f2738316adcb292816a9ac8af0e0cb5866 (diff) | |
| download | forums-1b4bad6583ffa8a7ba8a1e7f5f9c29c5654bba99.tar forums-1b4bad6583ffa8a7ba8a1e7f5f9c29c5654bba99.tar.gz forums-1b4bad6583ffa8a7ba8a1e7f5f9c29c5654bba99.tar.bz2 forums-1b4bad6583ffa8a7ba8a1e7f5f9c29c5654bba99.tar.xz forums-1b4bad6583ffa8a7ba8a1e7f5f9c29c5654bba99.zip | |
Merge remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2
Diffstat (limited to 'phpBB/phpbb/db/migrator.php')
| -rw-r--r-- | phpBB/phpbb/db/migrator.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index 6c026c3ae1..a425df56e8 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -632,7 +632,7 @@ class migrator */ protected function process_data_step($steps, $state, $revert = false) { - if (sizeof($steps) === 0) + if (count($steps) === 0) { return true; } @@ -659,7 +659,7 @@ class migrator // Result will be null or true if everything completed correctly // Stop after each update step, to let the updater control the script runtime $result = $this->run_step($steps[$step], $last_result, $revert); - if (($result !== null && $result !== true) || $step + 1 < sizeof($steps)) + if (($result !== null && $result !== true) || $step + 1 < count($steps)) { return array( 'result' => $result, |