aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/install_update.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-11-26 17:22:32 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-11-26 17:22:32 +0000
commit12fb5f6aa2286eb3e1be384ba61c66131088d4a1 (patch)
tree9c47eedfd40b2d2e5d9b559b821f4966dafe72a7 /phpBB/install/install_update.php
parent4d6f84c3208c0d941d3b786a1c60682e9c20193f (diff)
downloadforums-12fb5f6aa2286eb3e1be384ba61c66131088d4a1.tar
forums-12fb5f6aa2286eb3e1be384ba61c66131088d4a1.tar.gz
forums-12fb5f6aa2286eb3e1be384ba61c66131088d4a1.tar.bz2
forums-12fb5f6aa2286eb3e1be384ba61c66131088d4a1.tar.xz
forums-12fb5f6aa2286eb3e1be384ba61c66131088d4a1.zip
- fixed bug within the user_add function
- fixed some updater bugs git-svn-id: file:///svn/phpbb/trunk@6663 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/install_update.php')
-rw-r--r--phpBB/install/install_update.php10
1 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index aea6043f50..069022f0e5 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -891,6 +891,16 @@ class install_update extends module
// If the file is not modified we are finished here...
if ($diff->is_empty())
{
+ // Further check if it is already up to date - it could happen that non-modified files
+ // slip through
+ $diff = &new diff(file($this->new_location . $original_file), file($phpbb_root_path . $file));
+
+ if ($diff->is_empty())
+ {
+ $update_list['up_to_date'][] = $update_ary;
+ return;
+ }
+
$update_list['not_modified'][] = $update_ary;
return;
}