From a80cfafdd91a384ba810a8ee0d43406bba955faa Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Wed, 30 Jun 2010 13:38:49 -0500
Subject: [feature/soft-delete] Rename phpbb_visibility class to
phpbb_content_visibility
Rename the class to more accurately reflect what it does.
PHPBB3-9657
---
phpBB/viewtopic.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'phpBB/viewtopic.php')
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index e5a7f64cad..fde3631c56 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -83,7 +83,7 @@ if ($view && !$post_id)
$sql = 'SELECT post_id, topic_id, forum_id
FROM ' . POSTS_TABLE . "
WHERE topic_id = $topic_id
- AND " . phpbb_visibility::get_visibility_sql('post', $forum_id) . "
+ AND " . phpbb_content_visibility::get_visibility_sql('post', $forum_id) . "
AND post_time > $topic_last_read
AND forum_id = $forum_id
ORDER BY post_time ASC";
@@ -137,7 +137,7 @@ if ($view && !$post_id)
WHERE forum_id = ' . $row['forum_id'] . "
AND topic_moved_id = 0
AND topic_last_post_time $sql_condition {$row['topic_last_post_time']}
- AND" . phpbb_visibility::get_visibility_sql('topic', $row['forum_id']) . "
+ AND" . phpbb_content_visibility::get_visibility_sql('topic', $row['forum_id']) . "
ORDER BY topic_last_post_time $sql_ordering";
$result = $db->sql_query_limit($sql, 1);
$row = $db->sql_fetchrow($result);
@@ -277,7 +277,7 @@ if ($post_id)
$sql = 'SELECT COUNT(p.post_id) AS prev_posts
FROM ' . POSTS_TABLE . " p
WHERE p.topic_id = {$topic_data['topic_id']}
- " . phpbb_visibility::get_visibility_sql('post', $forum_id, 'p.');
+ " . phpbb_content_visibility::get_visibility_sql('post', $forum_id, 'p.');
if ($sort_dir == 'd')
{
@@ -408,7 +408,7 @@ if ($sort_days)
FROM ' . POSTS_TABLE . "
WHERE topic_id = $topic_id
AND post_time >= $min_post_time
- AND " . phpbb_visibility::get_visibility_sql('post', $forum_id);
+ AND " . phpbb_content_visibility::get_visibility_sql('post', $forum_id);
$result = $db->sql_query($sql);
$total_posts = (int) $db->sql_fetchfield('num_posts');
$db->sql_freeresult($result);
@@ -945,7 +945,7 @@ $i = $i_total = 0;
$sql = 'SELECT p.post_id
FROM ' . POSTS_TABLE . ' p' . (($join_user_sql[$sort_key]) ? ', ' . USERS_TABLE . ' u': '') . "
WHERE p.topic_id = $topic_id
- AND " . phpbb_visibility::get_visibility_sql('post', $forum_id, 'p.') . "
+ AND " . phpbb_content_visibility::get_visibility_sql('post', $forum_id, 'p.') . "
" . (($join_user_sql[$sort_key]) ? 'AND u.user_id = p.poster_id': '') . "
$limit_posts_time
ORDER BY $sql_sort_order";
--
cgit v1.2.1