aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/install/installer.php
diff options
context:
space:
mode:
authorMate Bartus <mate.bartus@gmail.com>2015-07-09 19:08:28 +0200
committerMate Bartus <mate.bartus@gmail.com>2015-07-09 19:08:28 +0200
commite967f3c1a81eab0f14daf314b7fb1b2001e4d220 (patch)
tree5cc1fb9d39392e53ce1f50a33ee33aee8115bfae /phpBB/phpbb/install/installer.php
parentb284e31a9e55e5fc617a229439282cc6d746432a (diff)
downloadforums-e967f3c1a81eab0f14daf314b7fb1b2001e4d220.tar
forums-e967f3c1a81eab0f14daf314b7fb1b2001e4d220.tar.gz
forums-e967f3c1a81eab0f14daf314b7fb1b2001e4d220.tar.bz2
forums-e967f3c1a81eab0f14daf314b7fb1b2001e4d220.tar.xz
forums-e967f3c1a81eab0f14daf314b7fb1b2001e4d220.zip
[ticket/13740] Fix itteration problems, implement class name aware collections
PHPBB3-13740
Diffstat (limited to 'phpBB/phpbb/install/installer.php')
-rw-r--r--phpBB/phpbb/install/installer.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php
index 3e73d90453..c1ac2de7f9 100644
--- a/phpBB/phpbb/install/installer.php
+++ b/phpBB/phpbb/install/installer.php
@@ -137,9 +137,9 @@ class installer
foreach ($this->installer_modules as $name => $module)
{
// Skip forward until the current task is reached
- if (!empty($task_name) && !$module_found)
+ if (!$module_found)
{
- if ($module_name === $name)
+ if ($module_name === $name || empty($module_name))
{
$module_found = true;
}
@@ -245,7 +245,7 @@ class installer
/**
* Recover install progress
*
- * @return int Index of the next installer module to execute
+ * @return string Index of the next installer module to execute
*/
protected function recover_progress()
{