'.t('OpenID redirect'). "

From b64adf07c82087816dc5c4b37c13c0ef4d69223c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= Date: Fri, 19 Oct 2007 10:19:03 +0000 Subject: #182645 by scor: clean up concatenations to be in line with core coding standards --- modules/comment/comment.module | 2 +- modules/node/node.module | 4 ++-- modules/openid/openid.inc | 4 ++-- modules/poll/poll.pages.inc | 2 +- modules/system/system.install | 14 +++++++------- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'modules') diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 7e3ddb751..ea4bdfa50 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -362,7 +362,7 @@ function comment_new_page_count($num_comments, $new_replies, $node) { $pageno = $count / $comments_per_page; } if ($pageno >= 1) { - $pagenum = "page=" . intval($pageno); + $pagenum = "page=". intval($pageno); } return $pagenum; } diff --git a/modules/node/node.module b/modules/node/node.module index bfe61462b..03fb05f1c 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -663,10 +663,10 @@ function node_load($param = array(), $revision = NULL, $reset = NULL) { // No db_rewrite_sql is applied so as to get complete indexing for search. if ($revision) { array_unshift($arguments, $revision); - $node = db_fetch_object(db_query('SELECT '. $fields. ' FROM {node} n INNER JOIN {users} u ON u.uid = n.uid INNER JOIN {node_revisions} r ON r.nid = n.nid AND r.vid = %d WHERE '. $cond, $arguments)); + $node = db_fetch_object(db_query('SELECT '. $fields .' FROM {node} n INNER JOIN {users} u ON u.uid = n.uid INNER JOIN {node_revisions} r ON r.nid = n.nid AND r.vid = %d WHERE '. $cond, $arguments)); } else { - $node = db_fetch_object(db_query('SELECT '. $fields. ' FROM {node} n INNER JOIN {users} u ON u.uid = n.uid INNER JOIN {node_revisions} r ON r.vid = n.vid WHERE '. $cond, $arguments)); + $node = db_fetch_object(db_query('SELECT '. $fields .' FROM {node} n INNER JOIN {users} u ON u.uid = n.uid INNER JOIN {node_revisions} r ON r.vid = n.vid WHERE '. $cond, $arguments)); } if ($node && $node->nid) { diff --git a/modules/openid/openid.inc b/modules/openid/openid.inc index 8eeaedd55..1eb677341 100644 --- a/modules/openid/openid.inc +++ b/modules/openid/openid.inc @@ -41,7 +41,7 @@ function openid_redirect_http($url, $message) { * Creates a js auto-submit redirect for (for the 2.x protocol) */ function openid_redirect($url, $message) { - $output = ''.t('OpenID redirect'). "\n"; + $output = ''. t('OpenID redirect') ."\n"; $output .= drupal_get_form('openid_redirect_form', $url, $message); $output .= ''; $output .= "\n"; @@ -354,7 +354,7 @@ function _openid_dh_rand($stop) { } do { - $bytes = "\x00" . _openid_get_bytes($nbytes); + $bytes = "\x00". _openid_get_bytes($nbytes); $n = _openid_dh_binary_to_long($bytes); // Keep looping if this value is in the low duplicated range. } while (bccomp($n, $duplicate) < 0); diff --git a/modules/poll/poll.pages.inc b/modules/poll/poll.pages.inc index 387e08b2e..7ac47d102 100644 --- a/modules/poll/poll.pages.inc +++ b/modules/poll/poll.pages.inc @@ -35,7 +35,7 @@ function poll_votes($node) { $header[] = array('data' => t('Visitor'), 'field' => 'u.name'); $header[] = array('data' => t('Vote'), 'field' => 'pv.chorder'); - $result = pager_query("SELECT pv.chorder, pv.uid, pv.hostname, u.name FROM {poll_votes} pv LEFT JOIN {users} u ON pv.uid = u.uid WHERE pv.nid = %d" . tablesort_sql($header), 20, 0, NULL, $node->nid); + $result = pager_query("SELECT pv.chorder, pv.uid, pv.hostname, u.name FROM {poll_votes} pv LEFT JOIN {users} u ON pv.uid = u.uid WHERE pv.nid = %d". tablesort_sql($header), 20, 0, NULL, $node->nid); $rows = array(); while ($vote = db_fetch_object($result)) { $rows[] = array( diff --git a/modules/system/system.install b/modules/system/system.install index ecbd29bd0..cc2c5bf8c 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -1309,7 +1309,7 @@ function system_update_123() { $ret[] = update_sql("UPDATE {vocabulary} SET module = 'taxonomy'"); $vid = variable_get('forum_nav_vocabulary', ''); if (!empty($vid)) { - $ret[] = update_sql("UPDATE {vocabulary} SET module = 'forum' WHERE vid = " . $vid); + $ret[] = update_sql("UPDATE {vocabulary} SET module = 'forum' WHERE vid = ". $vid); } return $ret; @@ -1916,7 +1916,7 @@ function system_update_151() { for ($loop = 0; $loop <= 1 ; $loop ++) { // create new Primary and Secondary links menus $menus[$loop]['pid'] = db_next_id('{menu}_mid'); - $ret[] = update_sql("INSERT INTO {menu} (mid, pid, path, title, description, weight, type) " . + $ret[] = update_sql("INSERT INTO {menu} (mid, pid, path, title, description, weight, type) ". "VALUES ({$menus[$loop]['pid']}, 0, '', '{$menus[$loop]['menu_name']}', '', 0, 115)"); // Gather links from various settings into a single array. @@ -1955,10 +1955,10 @@ function system_update_151() { } $mid = db_next_id('{menu}_mid'); - $ret[] = update_sql("INSERT INTO {menu} (mid, pid, path, title, description, weight, type) " . - "VALUES ($mid, {$menus[$loop]['pid']}, '" . db_escape_string($href) . - "', '" . db_escape_string($links['text'][$i]) . - "', '" . db_escape_string($links['description'][$i]) . "', 0, 118)"); + $ret[] = update_sql("INSERT INTO {menu} (mid, pid, path, title, description, weight, type) ". + "VALUES ($mid, {$menus[$loop]['pid']}, '". db_escape_string($href) . + "', '". db_escape_string($links['text'][$i]) . + "', '". db_escape_string($links['description'][$i]) ."', 0, 118)"); } } // delete Secondary links if not populated. @@ -3910,7 +3910,7 @@ function system_update_6019() { // Remove default => 0, set auto increment. $new_uid = 1 + db_result(db_query('SELECT MAX(uid) FROM {users}')); - $ret[] = update_sql('UPDATE {users} SET uid = '. $new_uid . ' WHERE uid = 0'); + $ret[] = update_sql('UPDATE {users} SET uid = '. $new_uid .' WHERE uid = 0'); db_drop_primary_key($ret, 'users'); db_change_field($ret, 'users', 'uid', 'uid', array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE), array('primary key' => array('uid'))); $ret[] = update_sql('UPDATE {users} SET uid = 0 WHERE uid = '. $new_uid); -- cgit v1.2.3