From f6bb6dda3f3ab856cd77f06dab649697e695292e Mon Sep 17 00:00:00 2001 From: Jim Wigginton Date: Fri, 24 Apr 2009 17:27:10 +0000 Subject: [PATCH] Fixed bug #'ers 42585, 35505, 36675, and 42705 Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9482 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 4 ++++ phpBB/includes/mcp/mcp_queue.php | 15 +++++++++------ phpBB/memberlist.php | 1 + phpBB/search.php | 15 ++++++++------- .../prosilver/template/memberlist_body.html | 2 +- .../styles/prosilver/template/viewtopic_body.html | 2 +- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 41ecda5efa..9e6b106549 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -145,6 +145,10 @@
  • [Fix] Ability to vote in poll is now required for the ability to change existing vote. (Bug #38925)
  • [Fix] Search for 'topic title only' and 'first post' should work again for non-mysql dbms. (Bug #40605)
  • [Fix] Make sure additional information for accessibility is always exposed to screen readers (Bug #44335 - patch by MarcoZ)
    • +
  • [Fix] Approving a topic when some of the posts within that topic have already been approved (Bug #42585 - Patch by TerraFrost)
    • +
  • [Fix] Online status shown when post hidden (Bug #35505 - Patch by Raimon)
    • +
  • [Fix] memberlist.php display formating can be distorted by posting long URL for website (Bug #36675 - Patch by TerraFrost)
    • +
  • [Fix] queued replies missing from "view new posts" (Bug #42705 - Patch by Paul)
  • [Change] Default difference view is now 'inline' instead of 'side by side'
  • [Change] Added new option for merging differences to conflicting files in automatic updater
  • [Change] Add link to user profile in the MCP for user notes and warn user.
    • diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 1a35524167..6209a27bf7 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -545,12 +545,6 @@ function approve_post($post_id_list, $id, $mode) } else { - if (!isset($topic_replies_sql[$post_data['topic_id']])) - { - $topic_replies_sql[$post_data['topic_id']] = 0; - } - $topic_replies_sql[$post_data['topic_id']]++; - $approve_log[] = array( 'type' => 'post', 'post_subject' => $post_data['post_subject'], @@ -559,6 +553,15 @@ function approve_post($post_id_list, $id, $mode) ); } + if ($post_data['topic_replies_real'] > 0) + { + if (!isset($topic_replies_sql[$post_data['topic_id']])) + { + $topic_replies_sql[$post_data['topic_id']] = 0; + } + $topic_replies_sql[$post_data['topic_id']]++; + } + if ($post_data['forum_id']) { if (!isset($forum_topics_posts[$post_data['forum_id']])) diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 5155431dbf..298164be9e 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1626,6 +1626,7 @@ function show_profile($data) 'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($data['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $user_id) : '', 'U_EMAIL' => $email, 'U_WWW' => (!empty($data['user_website'])) ? $data['user_website'] : '', + 'U_SHORT_WWW' => (!empty($data['user_website'])) ? ((strlen($data['user_website']) > 55) ? substr($data['user_website'], 0, 39) . ' ... ' . substr($data['user_website'], -10) : $data['user_website']) : '', 'U_ICQ' => ($data['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . urlencode($data['user_icq']) : '', 'U_AIM' => ($data['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=aim&u=' . $user_id) : '', 'U_YIM' => ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($data['user_yim']) . '&.src=pg' : '', diff --git a/phpBB/search.php b/phpBB/search.php index 7c21b8dd01..7192127e5a 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -365,13 +365,14 @@ if ($keywords || $author || $author_id || $search_id || $submit) } else { - $sql = 'SELECT t.topic_id - FROM ' . TOPICS_TABLE . ' t - WHERE t.topic_last_post_time > ' . $user->data['user_lastvisit'] . ' - AND t.topic_moved_id = 0 - ' . str_replace(array('p.', 'post_'), array('t.', 'topic_'), $m_approve_fid_sql) . ' - ' . ((sizeof($ex_fid_ary)) ? 'AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '') . " - $sql_sort"; + $sql = 'SELECT t.topic_id + FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p + WHERE p.post_time > ' . $user->data['user_lastvisit'] . ' + AND t.topic_id = p.topic_id + AND t.topic_moved_id = 0 + ' . $m_approve_fid_sql . ' + ' . ((sizeof($ex_fid_ary)) ? 'AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '') . " + $sql_sort"; $field = 'topic_id'; } break; diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 883f05b514..ab2be261a8 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -132,7 +132,7 @@ {memberrow.RANK_IMG}{memberrow.RANK_TITLE} {memberrow.USERNAME_FULL}
    [ {L_SELECT} ] {memberrow.POSTS}{memberrow.POSTS} -
    {memberrow.U_WWW}
    {memberrow.LOCATION}
      +
    {memberrow.U_SHORT_WWW}
    {memberrow.LOCATION}
      {memberrow.JOINED} {memberrow.VISITED}  diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 87685106ad..17088bb16a 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -114,7 +114,7 @@ -
    +