aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-01-30 16:14:39 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-01-30 16:14:39 +0000
commit4b5fab372ff69a809144dee3a0a7f90c219fe400 (patch)
tree3835425dae514f7296b6aaf77eed81c7f2617a5f /phpBB/install
parent140746089594307c9bc2ad084ea2355dcbddbe16 (diff)
downloadforums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar
forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar.gz
forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar.bz2
forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar.xz
forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.zip
merge with revision #r8350
git-svn-id: file:///svn/phpbb/trunk@8351 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/install_update.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index adbe03283b..d494007f3d 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -53,7 +53,7 @@ class install_update extends module
{
var $p_master;
var $update_info;
-
+
var $old_location;
var $new_location;
var $latest_version;
@@ -764,7 +764,7 @@ class install_update extends module
{
continue;
}
-
+
$methods[] = $type;
}
@@ -1490,7 +1490,7 @@ class install_update extends module
return;
}
- if (in_array($file, array_keys($this->update_info['custom'])))
+ if (isset($this->update_info['custom'][$file]))
{
foreach ($this->update_info['custom'][$file] as $_file)
{