makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: sql_return_on_error() calls. Now works as expected

Browse source 
Changed: var types explicitly casted

This checkin msg is dedicated to dhn ;)


git-svn-id: file:///svn/phpbb/trunk@4508 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ludovic Arnaud 2003-09-17 21:51:21 +00:00
parent 57f8f26999
commit 49b47422b3
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
phpBB/includes/functions.php
View file

@ -472,7 +472,7 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $marktime = false)
// Mark one forum as read. // Mark one forum as read.
// Do this by inserting a record with -$forum_id in the 'forum_id' field. // Do this by inserting a record with -$forum_id in the 'forum_id' field.
// User has marked this topic as read before: Update the record // User has marked this topic as read before: Update the record
$db->sql_return_on_error = true; $db->sql_return_on_error(true);
$sql = 'UPDATE ' . FORUMS_TRACK_TABLE . " $sql = 'UPDATE ' . FORUMS_TRACK_TABLE . "
SET mark_time = $current_time SET mark_time = $current_time
@ -489,7 +489,7 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $marktime = false)
$db->sql_query($sql); $db->sql_query($sql);
} }
$db->sql_return_on_error = false; $db->sql_return_on_error(false);
} }
else else
{ {
@ -530,7 +530,7 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $marktime = false)
} }
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$db->sql_return_on_error = true; $db->sql_return_on_error(true);
if ($row = $db->sql_fetchrow($result)) if ($row = $db->sql_fetchrow($result))
{ {
do do
@ -574,7 +574,7 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $marktime = false)
while ($row = $db->sql_fetchrow($result)); while ($row = $db->sql_fetchrow($result));
$db->sql_freeresult($result); $db->sql_freeresult($result);
$db->sql_return_on_error = false; $db->sql_return_on_error(false);
if (!$config['load_db_lastread']) if (!$config['load_db_lastread'])
{ {
@ -599,9 +599,13 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $marktime = false)
AND mark_time < $current_time"; AND mark_time < $current_time";
if (!$db->sql_query($sql) || !$db->sql_affectedrows()) if (!$db->sql_query($sql) || !$db->sql_affectedrows())
{ {
$db->sql_return_on_error(true);
$sql = 'INSERT INTO ' . TOPICS_TRACK_TABLE . ' (user_id, topic_id, mark_type, mark_time) $sql = 'INSERT INTO ' . TOPICS_TRACK_TABLE . ' (user_id, topic_id, mark_type, mark_time)
VALUES (' . $user->data['user_id'] . ", $topic_id, $type, $current_time)"; VALUES (' . $user->data['user_id'] . ", $topic_id, $type, $current_time)";
$db->sql_query($sql); $db->sql_query($sql);
$db->sql_return_on_error(false);
} }
} }
@ -735,15 +739,11 @@ function obtain_word_list(&$censors)
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$censors = array(); $censors = array();
if ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{
do
{ {
$censors['match'][] = '#\b(' . str_replace('\*', '\w*?', preg_quote($row['word'], '#')) . ')\b#i'; $censors['match'][] = '#\b(' . str_replace('\*', '\w*?', preg_quote($row['word'], '#')) . ')\b#i';
$censors['replace'][] = $row['replacement']; $censors['replace'][] = $row['replacement'];
} }
while ($row = $db->sql_fetchrow($result));
}
$db->sql_freeresult($result); $db->sql_freeresult($result);
$cache->put('word_censors', $censors); $cache->put('word_censors', $censors);
@ -773,9 +773,9 @@ function obtain_icons(&$icons)
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$icons[$row['icons_id']]['img'] = $row['icons_url']; $icons[$row['icons_id']]['img'] = $row['icons_url'];
$icons[$row['icons_id']]['width'] = $row['icons_width']; $icons[$row['icons_id']]['width'] = (int) $row['icons_width'];
$icons[$row['icons_id']]['height'] = $row['icons_height']; $icons[$row['icons_id']]['height'] = (int) $row['icons_height'];
$icons[$row['icons_id']]['display'] = $row['display_on_posting']; $icons[$row['icons_id']]['display'] = (bool) $row['display_on_posting'];
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);