aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/update_script.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-08-17 23:58:03 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-08-17 23:58:03 +0000
commitbca30bbe4801684831be42c2ef6d8e598856be84 (patch)
tree5ebb06b0b6cb0bd75dd22fa8622548f1bf6c51bb /phpBB/install/update_script.php
parent27838c6f027eed4f60a55a745a73c55975c7506f (diff)
downloadforums-bca30bbe4801684831be42c2ef6d8e598856be84.tar
forums-bca30bbe4801684831be42c2ef6d8e598856be84.tar.gz
forums-bca30bbe4801684831be42c2ef6d8e598856be84.tar.bz2
forums-bca30bbe4801684831be42c2ef6d8e598856be84.tar.xz
forums-bca30bbe4801684831be42c2ef6d8e598856be84.zip
Failed on no groups ...
git-svn-id: file:///svn/phpbb/trunk@2875 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/update_script.php')
-rw-r--r--phpBB/install/update_script.php20
1 files changed, 17 insertions, 3 deletions
diff --git a/phpBB/install/update_script.php b/phpBB/install/update_script.php
index 45104e6ab7..011557b4e6 100644
--- a/phpBB/install/update_script.php
+++ b/phpBB/install/update_script.php
@@ -465,6 +465,10 @@ switch ( $this_version )
gen_str_ok();
}
+ else
+ {
+ gen_str_skip();
+ }
$db->sql_return_on_error(false);
}
}
@@ -624,9 +628,12 @@ switch ( $this_version )
//
// Clean up user_group and groups
//
- $sql = "DELETE FROM " . $table_prefix . "user_group
- WHERE group_id NOT IN ($delete_ug_sql)";
- $db->sql_query($sql);
+ if ( $delete_ug_sql )
+ {
+ $sql = "DELETE FROM " . $table_prefix . "user_group
+ WHERE group_id NOT IN ($delete_ug_sql)";
+ $db->sql_query($sql);
+ }
$sql = "DELETE FROM " . $table_prefix . "groups
WHERE group_single_user = 1";
@@ -992,6 +999,7 @@ td.cat { background-image: url('../admin/images/cellpic1.gif') }
h1 { margin-left:15px }
.ok { font-family: 'Courier New',courier; color:green; font-size:10pt }
+.skip { font-family: 'Courier New',courier; color:blue; font-size:10pt }
.updtext { font-family: 'Courier New', courier; font-size:10pt;margin-left:25px}
//-->
@@ -1044,6 +1052,12 @@ function gen_str_ok()
flush();
}
+function gen_str_skip()
+{
+ print "<span class=\"skip\"><b>SKIPPED</b></span><br />\n";
+ flush();
+}
+
//
//
//