mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
Failed on no groups ...
git-svn-id: file:///svn/phpbb/trunk@2875 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
27838c6f02
commit
bca30bbe48
1 changed files with 17 additions and 3 deletions
|
@ -465,6 +465,10 @@ switch ( $this_version )
|
||||||
|
|
||||||
gen_str_ok();
|
gen_str_ok();
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
gen_str_skip();
|
||||||
|
}
|
||||||
$db->sql_return_on_error(false);
|
$db->sql_return_on_error(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -624,9 +628,12 @@ switch ( $this_version )
|
||||||
//
|
//
|
||||||
// Clean up user_group and groups
|
// Clean up user_group and groups
|
||||||
//
|
//
|
||||||
$sql = "DELETE FROM " . $table_prefix . "user_group
|
if ( $delete_ug_sql )
|
||||||
WHERE group_id NOT IN ($delete_ug_sql)";
|
{
|
||||||
$db->sql_query($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
|
$sql = "DELETE FROM " . $table_prefix . "groups
|
||||||
WHERE group_single_user = 1";
|
WHERE group_single_user = 1";
|
||||||
|
@ -992,6 +999,7 @@ td.cat { background-image: url('../admin/images/cellpic1.gif') }
|
||||||
h1 { margin-left:15px }
|
h1 { margin-left:15px }
|
||||||
|
|
||||||
.ok { font-family: 'Courier New',courier; color:green; font-size:10pt }
|
.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}
|
.updtext { font-family: 'Courier New', courier; font-size:10pt;margin-left:25px}
|
||||||
|
|
||||||
//-->
|
//-->
|
||||||
|
@ -1044,6 +1052,12 @@ function gen_str_ok()
|
||||||
flush();
|
flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function gen_str_skip()
|
||||||
|
{
|
||||||
|
print "<span class=\"skip\"><b>SKIPPED</b></span><br />\n";
|
||||||
|
flush();
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
|
|
Loading…
Add table
Reference in a new issue