aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-12-16 02:59:38 +0100
committerOleg Pudeyev <oleg@bsdpower.com>2011-02-12 22:05:52 -0500
commit6fc11184e7d2fd2a46d915738ae7f686c8547433 (patch)
tree7903017fde0692e52bf10675aa6472107095d8bc
parent6235957aa13bbb58d59c38d739331e9982c671d6 (diff)
downloadforums-6fc11184e7d2fd2a46d915738ae7f686c8547433.tar
forums-6fc11184e7d2fd2a46d915738ae7f686c8547433.tar.gz
forums-6fc11184e7d2fd2a46d915738ae7f686c8547433.tar.bz2
forums-6fc11184e7d2fd2a46d915738ae7f686c8547433.tar.xz
forums-6fc11184e7d2fd2a46d915738ae7f686c8547433.zip
[feature/system-cron] Adjust SQL query style to follow coding guidelines.
PHPBB3-9596
-rw-r--r--phpBB/includes/cron/lock.php6
-rw-r--r--phpBB/includes/cron/task/core/prune_all_forums.php3
2 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/includes/cron/lock.php b/phpBB/includes/cron/lock.php
index c7b9e3b169..b407191922 100644
--- a/phpBB/includes/cron/lock.php
+++ b/phpBB/includes/cron/lock.php
@@ -50,7 +50,8 @@ class phpbb_cron_lock
$sql = 'UPDATE ' . CONFIG_TABLE . "
SET config_value = '" . $db->sql_escape($this->cron_id) . "'
- WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape($config['cron_lock']) . "'";
+ WHERE config_name = 'cron_lock'
+ AND config_value = '" . $db->sql_escape($config['cron_lock']) . "'";
$db->sql_query($sql);
// another cron process altered the table between script start and UPDATE query so exit
@@ -73,7 +74,8 @@ class phpbb_cron_lock
$sql = 'UPDATE ' . CONFIG_TABLE . "
SET config_value = '0'
- WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape($this->cron_id) . "'";
+ WHERE config_name = 'cron_lock'
+ AND config_value = '" . $db->sql_escape($this->cron_id) . "'";
$db->sql_query($sql);
}
}
diff --git a/phpBB/includes/cron/task/core/prune_all_forums.php b/phpBB/includes/cron/task/core/prune_all_forums.php
index 44b04611d5..2e6f2444d3 100644
--- a/phpBB/includes/cron/task/core/prune_all_forums.php
+++ b/phpBB/includes/cron/task/core/prune_all_forums.php
@@ -40,7 +40,8 @@ class phpbb_cron_task_core_prune_all_forums extends phpbb_cron_task_base
$sql = 'SELECT forum_id, prune_next, enable_prune, prune_days, prune_viewed, forum_flags, prune_freq
FROM ' . FORUMS_TABLE . "
- WHERE enable_prune = 1 and prune_next < " . time();
+ WHERE enable_prune = 1
+ AND prune_next < " . time();
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{