aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-09-06 23:59:35 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-09-06 23:59:35 +0000
commitdf86a1b27c14f81915d11038072eba2df5ecdd93 (patch)
tree67cddf3b0b414f071130427762c548dfc0f8279e /phpBB
parentbd212ff7305c4e0a3eadd2867164446aebff3ca6 (diff)
downloadforums-df86a1b27c14f81915d11038072eba2df5ecdd93.tar
forums-df86a1b27c14f81915d11038072eba2df5ecdd93.tar.gz
forums-df86a1b27c14f81915d11038072eba2df5ecdd93.tar.bz2
forums-df86a1b27c14f81915d11038072eba2df5ecdd93.tar.xz
forums-df86a1b27c14f81915d11038072eba2df5ecdd93.zip
Some smaller changes to r10041.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10112 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions_admin.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 205d7046c7..d42a81fa35 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2517,15 +2517,15 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
if ($topic_id)
{
- $sql_forum = 'AND l.topic_id = ' . intval($topic_id);
+ $sql_forum = 'AND l.topic_id = ' . (int) $topic_id;
}
else if (is_array($forum_id))
{
$sql_forum = 'AND ' . $db->sql_in_set('l.forum_id', array_map('intval', $forum_id));
}
- else
+ else if ($forum_id)
{
- $sql_forum = ($forum_id) ? 'AND l.forum_id = ' . intval($forum_id) : '';
+ $sql_forum = 'AND l.forum_id = ' . (int) $forum_id;
}
break;
@@ -2560,7 +2560,7 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
}
$operations = array();
- foreach ($user->lang as $key=>$value)
+ foreach ($user->lang as $key => $value)
{
if (substr($key, 0, 4) == 'LOG_' && preg_match($keywords_pattern, $value))
{
@@ -2571,9 +2571,9 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
$sql_keywords = 'AND (';
if (!empty($operations))
{
- $sql_keywords.= $db->sql_in_set('l.log_operation', $operations) . ' OR ';
+ $sql_keywords .= $db->sql_in_set('l.log_operation', $operations) . ' OR ';
}
- $sql_keywords.= 'LOWER(l.log_data) ' . implode(' OR LOWER(l.log_data) ', $keywords) . ')';
+ $sql_keywords .= 'LOWER(l.log_data) ' . implode(' OR LOWER(l.log_data) ', $keywords) . ')';
}
$sql = "SELECT l.*, u.username, u.username_clean, u.user_colour