mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-05 08:17:47 +02:00
Loads of bug fixes and updates
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@2564 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -330,7 +330,6 @@ switch( $mode )
|
||||
else
|
||||
{
|
||||
// Not confirmed, show confirmation message
|
||||
|
||||
if ( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) )
|
||||
{
|
||||
message_die(GENERAL_MESSAGE, $lang['None_selected']);
|
||||
@@ -381,6 +380,11 @@ switch( $mode )
|
||||
|
||||
if ( $confirm )
|
||||
{
|
||||
if ( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) )
|
||||
{
|
||||
message_die(GENERAL_MESSAGE, $lang['None_selected']);
|
||||
}
|
||||
|
||||
$new_forum_id = $HTTP_POST_VARS['new_forum'];
|
||||
$old_forum_id = $forum_id;
|
||||
|
||||
@@ -520,6 +524,11 @@ switch( $mode )
|
||||
break;
|
||||
|
||||
case 'lock':
|
||||
if ( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) )
|
||||
{
|
||||
message_die(GENERAL_MESSAGE, $lang['None_selected']);
|
||||
}
|
||||
|
||||
$topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ? $HTTP_POST_VARS['topic_id_list'] : array($topic_id);
|
||||
|
||||
$topic_id_sql = '';
|
||||
@@ -559,6 +568,11 @@ switch( $mode )
|
||||
break;
|
||||
|
||||
case 'unlock':
|
||||
if ( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) )
|
||||
{
|
||||
message_die(GENERAL_MESSAGE, $lang['None_selected']);
|
||||
}
|
||||
|
||||
$topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ? $HTTP_POST_VARS['topic_id_list'] : array($topic_id);
|
||||
|
||||
$topic_id_sql = '';
|
||||
@@ -858,7 +872,7 @@ switch( $mode )
|
||||
FROM " . POSTS_TABLE . "
|
||||
WHERE poster_id = $poster_id
|
||||
GROUP BY poster_ip
|
||||
ORDER BY postings DESC";
|
||||
ORDER BY " . (( SQL_LAYER == 'msaccess' ) ? 'COUNT(*)' : 'postings' ) . " DESC";
|
||||
if ( !($result = $db->sql_query($sql)) )
|
||||
{
|
||||
message_die(GENERAL_ERROR, 'Could not get IP information for this user', '', __LINE__, __FILE__, $sql);
|
||||
@@ -905,7 +919,7 @@ switch( $mode )
|
||||
WHERE p.poster_id = u.user_id
|
||||
AND p.poster_ip = '" . $post_row['poster_ip'] . "'
|
||||
GROUP BY u.user_id, u.username
|
||||
ORDER BY postings DESC";
|
||||
ORDER BY " . (( SQL_LAYER == 'msaccess' ) ? 'COUNT(*)' : 'postings' ) . " DESC";
|
||||
if ( !($result = $db->sql_query($sql)) )
|
||||
{
|
||||
message_die(GENERAL_ERROR, 'Could not get posters information based on IP', '', __LINE__, __FILE__, $sql);
|
||||
@@ -1003,12 +1017,12 @@ switch( $mode )
|
||||
if ( $row['topic_type'] == POST_ANNOUNCE )
|
||||
{
|
||||
$folder_img = $images['folder_announce'];
|
||||
$folder_alt = $lang['Announcement'];
|
||||
$folder_alt = $lang['Topic_Announcement'];
|
||||
}
|
||||
else if ( $row['topic_type'] == POST_STICKY )
|
||||
{
|
||||
$folder_img = $images['folder_sticky'];
|
||||
$folder_alt = $lang['Sticky'];
|
||||
$folder_alt = $lang['Topic_Sticky'];
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user