mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +02:00
Ok, this includes fixes for bugs numbered 526000, 524591, 520370, and 520872. Manily, a few typos were fixed, along with a problem in the jumpbox (fixed using a quick Javascript check, there really isn't another way without modifying some large portions of code), and a problem in the rank control panel. In other words, everything assigned to me (as of this morning) has been fixed. I also ran the lovely fix_files.sh, so CVS might be a little wacky and try to update everything. I hope not...
That's it for now! dougk_ff7 git-svn-id: file:///svn/phpbb/trunk@2287 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -212,6 +212,15 @@ if( $mode != "" )
|
||||
message_die(GENERAL_ERROR, "Couldn't delete rank data", "", __LINE__, __FILE__, $sql);
|
||||
}
|
||||
|
||||
$sql = "UPDATE " . USERS_TABLE . "
|
||||
SET user_rank = 0
|
||||
WHERE user_rank = $rank_id";
|
||||
|
||||
if( !$result = $db->sql_query($sql) )
|
||||
{
|
||||
message_die(GENERAL_ERROR, $lang['No_update_ranks'], "", __LINE__, __FILE__, $sql);
|
||||
}
|
||||
|
||||
$message = $lang['Rank_removed'] . "<br /><br />" . sprintf($lang['Click_return_rankadmin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
|
||||
|
||||
message_die(GENERAL_MESSAGE, $message);
|
||||
|
Binary file not shown.
@@ -536,6 +536,7 @@ $lang['No_assigned_rank'] = "No special rank assigned";
|
||||
$lang['Rank_updated'] = "The rank was successfully updated";
|
||||
$lang['Rank_added'] = "The rank was successfully added";
|
||||
$lang['Rank_removed'] = "The rank was successfully deleted";
|
||||
$lang['No_update_ranks'] = "The rank was successfully deleted, however user accounts using this rank were not updated. You will need to manually reset the rank on these accounts";
|
||||
|
||||
$lang['Click_return_rankadmin'] = "Click %sHere%s to return to Rank Administration";
|
||||
|
||||
|
@@ -531,7 +531,7 @@ $lang['File_no_data'] = "The file at the URL you gave contains no data";
|
||||
$lang['No_connection_URL'] = "A connection could not be made to the URL you gave";
|
||||
$lang['Incomplete_URL'] = "The URL you entered is incomplete";
|
||||
$lang['Wrong_remote_avatar_format'] = "The URL of the remote avatar is not valid";
|
||||
$lang['No_send_account_inactive'] = "Sorry but you're password cannot be retrieved because you account is currently inactive. Please contact the forum administrator for more information";
|
||||
$lang['No_send_account_inactive'] = "Sorry, but your password cannot be retrieved because your account is currently inactive. Please contact the forum administrator for more information";
|
||||
|
||||
$lang['Always_smile'] = "Always enable Smilies";
|
||||
$lang['Always_html'] = "Always allow HTML";
|
||||
|
@@ -1,5 +1,5 @@
|
||||
|
||||
<form method="GET" name="jumpbox" action="{S_JUMPBOX_ACTION}">
|
||||
<form method="GET" name="jumpbox" action="{S_JUMPBOX_ACTION}" onSubmit="if(document.jumpbox.f.value == -1){return false;}">
|
||||
<table cellspacing="0" cellpadding="0" border="0">
|
||||
<tr>
|
||||
<td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}: {S_JUMPBOX_LIST}
|
||||
|
Reference in New Issue
Block a user