mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
This commit is contained in:
Andreas Fischer 2013-08-16 18:04:52 +02:00
commit 772494af7e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/docs/coding-guidelines.html
View File

@ -832,7 +832,7 @@ $sql = 'SELECT *
$sql_ary = array( $sql_ary = array(
'somedata' => $my_string, 'somedata' => $my_string,
'otherdata' => $an_int, 'otherdata' => $an_int,
'moredata' => $another_int 'moredata' => $another_int,
); );
$db->sql_query('INSERT INTO ' . SOME_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); $db->sql_query('INSERT INTO ' . SOME_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
@ -844,7 +844,7 @@ $db->sql_query('INSERT INTO ' . SOME_TABLE . ' ' . $db->sql_build_array('I
$sql_ary = array( $sql_ary = array(
'somedata' => $my_string, 'somedata' => $my_string,
'otherdata' => $an_int, 'otherdata' => $an_int,
'moredata' => $another_int 'moredata' => $another_int,
); );
$sql = 'UPDATE ' . SOME_TABLE . ' $sql = 'UPDATE ' . SOME_TABLE . '
@ -937,20 +937,20 @@ $sql_array = array(
'FROM' => array( 'FROM' => array(
FORUMS_WATCH_TABLE => 'fw', FORUMS_WATCH_TABLE => 'fw',
FORUMS_TABLE => 'f' FORUMS_TABLE => 'f',
), ),
'LEFT_JOIN' => array( 'LEFT_JOIN' => array(
array( array(
'FROM' => array(FORUMS_TRACK_TABLE => 'ft'), 'FROM' => array(FORUMS_TRACK_TABLE => 'ft'),
'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id' 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id',
) ),
), ),
'WHERE' => 'fw.user_id = ' . $user->data['user_id'] . ' 'WHERE' => 'fw.user_id = ' . $user->data['user_id'] . '
AND f.forum_id = fw.forum_id', AND f.forum_id = fw.forum_id',
'ORDER_BY' => 'left_id' 'ORDER_BY' => 'left_id',
); );
$sql = $db->sql_build_query('SELECT', $sql_array); $sql = $db->sql_build_query('SELECT', $sql_array);
@ -964,13 +964,13 @@ $sql_array = array(
'FROM' => array( 'FROM' => array(
FORUMS_WATCH_TABLE => 'fw', FORUMS_WATCH_TABLE => 'fw',
FORUMS_TABLE => 'f' FORUMS_TABLE => 'f',
), ),
'WHERE' => 'fw.user_id = ' . $user->data['user_id'] . ' 'WHERE' => 'fw.user_id = ' . $user->data['user_id'] . '
AND f.forum_id = fw.forum_id', AND f.forum_id = fw.forum_id',
'ORDER_BY' => 'left_id' 'ORDER_BY' => 'left_id',
); );
if ($config['load_db_lastread']) if ($config['load_db_lastread'])
@ -978,8 +978,8 @@ if ($config['load_db_lastread'])
$sql_array['LEFT_JOIN'] = array( $sql_array['LEFT_JOIN'] = array(
array( array(
'FROM' => array(FORUMS_TRACK_TABLE => 'ft'), 'FROM' => array(FORUMS_TRACK_TABLE => 'ft'),
'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id' 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id',
) ),
); );
$sql_array['SELECT'] .= ', ft.mark_time '; $sql_array['SELECT'] .= ', ft.mark_time ';