diff --git a/includes/actions.inc b/includes/actions.inc index 511776126f4511b178b6414b504879e85b13f81e..008410fb49a1af9716d5157d7d73ee10df82dd3f 100644 --- a/includes/actions.inc +++ b/includes/actions.inc @@ -2,9 +2,9 @@ // $Id$ /** -* @file -* This is the actions engine for executing stored actions. -*/ + * @file + * This is the actions engine for executing stored actions. + */ /** * Perform a given list of actions by executing their callback functions. diff --git a/includes/batch.inc b/includes/batch.inc index 9f57162fa531d96fbe3134e52c1c2993ec2f20f2..cced0b4267f6f871d4b0bf549ce505d871888bed 100644 --- a/includes/batch.inc +++ b/includes/batch.inc @@ -291,7 +291,7 @@ function _batch_finished() { $batch =& batch_get(); // Execute the 'finished' callbacks for each batch set. - foreach($batch['sets'] as $key => $batch_set) { + foreach ($batch['sets'] as $key => $batch_set) { if (isset($batch_set['finished'])) { // Check if the set requires an additional file for functions definitions. if (isset($batch_set['file']) && is_file($batch_set['file'])) { diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 5345d59260a8edaa84820eb32f939632d38eddd9..772eb56217836b0c0a41fb000e3142f4e7855798 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -521,7 +521,7 @@ function bootstrap_invoke_all($hook) { foreach (module_list(TRUE, TRUE) as $module) { drupal_load('module', $module); module_invoke($module, $hook); - } + } } /** @@ -786,7 +786,7 @@ function drupal_get_messages($type = NULL, $clear_queue = TRUE) { if ($messages = drupal_set_message()) { if ($type) { if ($clear_queue) { - unset($_SESSION['messages'][$type]); + unset($_SESSION['messages'][$type]); } if (isset($messages[$type])) { return array($type => $messages[$type]); @@ -794,7 +794,7 @@ function drupal_get_messages($type = NULL, $clear_queue = TRUE) { } else { if ($clear_queue) { - unset($_SESSION['messages']); + unset($_SESSION['messages']); } return $messages; } diff --git a/includes/common.inc b/includes/common.inc index 1da58971ea5300218cd7c5efc8d8c7f4aa7c2efe..9eb381a6a676cd403793a31de0c6521b2828fc43 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1319,7 +1319,7 @@ function url($path = NULL, $options = array()) { // Will be empty if there is no language prefix. $path = trim($options['prefix'], '/'); } - + if ($clean_url) { // With Clean URLs. if ($options['query']) { @@ -1337,7 +1337,7 @@ function url($path = NULL, $options = array()) { } if (!empty($options['query'])) { $variables[] = $options['query']; - } + } if ($query = join('&', $variables)) { return $base . $script .'?'. $query . $options['fragment']; } @@ -1757,7 +1757,7 @@ function drupal_build_css_cache($types, $filename) { /** * Helper function for drupal_build_css_cache(). - * + * * This function will prefix all paths within a CSS file. */ function _drupal_build_css_path($matches, $base = NULL) { @@ -1835,7 +1835,7 @@ function drupal_load_stylesheet($file, $optimize = NULL) { /** * Loads stylesheets recursively and returns contents with corrected paths. - * + * * This function is used for recursive loading of stylesheets and * returns the stylesheet content with all url() paths corrected. */ @@ -1914,7 +1914,7 @@ function drupal_add_js($data = NULL, $type = 'module', $scope = 'header', $defer static $javascript = array(); if (isset($data)) { - + // Add jquery.js and drupal.js the first time a Javascript file is added. if (empty($javascript)) { $javascript['header'] = array( @@ -1925,7 +1925,7 @@ function drupal_add_js($data = NULL, $type = 'module', $scope = 'header', $defer 'module' => array(), 'theme' => array(), 'setting' => array(), 'inline' => array(), ); } - + if (isset($scope) && !isset($javascript[$scope])) { $javascript[$scope] = array('core' => array(), 'module' => array(), 'theme' => array(), 'setting' => array(), 'inline' => array()); } @@ -1933,7 +1933,7 @@ function drupal_add_js($data = NULL, $type = 'module', $scope = 'header', $defer if (isset($type) && isset($scope) && !isset($javascript[$scope][$type])) { $javascript[$scope][$type] = array(); } - + switch ($type) { case 'setting': $javascript[$scope][$type][] = $data; @@ -1948,7 +1948,7 @@ function drupal_add_js($data = NULL, $type = 'module', $scope = 'header', $defer } if (isset($scope)) { - + if (isset($javascript[$scope])) { return $javascript[$scope]; } diff --git a/includes/database.mysql-common.inc b/includes/database.mysql-common.inc index 7632f4a12b8efc69a2cd4af60e6f42dc57d43385..0f2c82b43d7f2544260256137a0678378f75b570 100644 --- a/includes/database.mysql-common.inc +++ b/includes/database.mysql-common.inc @@ -514,7 +514,7 @@ function db_change_field(&$ret, $table, $field, $field_new, $spec, $keys_new = a $sql = 'ALTER TABLE {'. $table .'} CHANGE '. $field .' '. _db_create_field_sql($field_new, _db_process_field($spec)); if (count($keys_new)) { - $sql .= ', ADD '.implode(', ADD ', _db_create_keys_sql($keys_new)); + $sql .= ', ADD '. implode(', ADD ', _db_create_keys_sql($keys_new)); } $ret[] = update_sql($sql); } diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc index eb63b0b9b14666e7e8063ad79402065b8f40007a..854f737d5d7a23bac5d9737d7327f5a2614903dc 100644 --- a/includes/database.mysql.inc +++ b/includes/database.mysql.inc @@ -74,7 +74,7 @@ function db_connect($url) { // Allow for non-standard MySQL port. if (isset($url['port'])) { - $url['host'] = $url['host'] .':'. $url['port']; + $url['host'] = $url['host'] .':'. $url['port']; } // - TRUE makes mysql_connect() always open a new link, even if diff --git a/includes/database.mysqli.inc b/includes/database.mysqli.inc index ecd30248be4b65e4460f92c776f9dff26cb0a338..9c00b3e9dcee0741f2fa4084ec656e1187dc2f62 100644 --- a/includes/database.mysqli.inc +++ b/includes/database.mysqli.inc @@ -203,16 +203,16 @@ function db_fetch_array($result) { } /** -* Return an individual result field from the previous query. -* -* Only use this function if exactly one field is being selected; otherwise, -* use db_fetch_object() or db_fetch_array(). -* -* @param $result -* A database query result resource, as returned from db_query(). -* @return -* The resulting field or FALSE. -*/ + * Return an individual result field from the previous query. + * + * Only use this function if exactly one field is being selected; otherwise, + * use db_fetch_object() or db_fetch_array(). + * + * @param $result + * A database query result resource, as returned from db_query(). + * @return + * The resulting field or FALSE. + */ function db_result($result) { if ($result && mysqli_num_rows($result) > 0) { // The mysqli_fetch_row function has an optional second parameter $row diff --git a/includes/form.inc b/includes/form.inc index d7a41e4827b07d3b5669e08f279a3e62514d8719..088893b747527277896869b057dff0f29f1881c9 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -415,7 +415,7 @@ function drupal_process_form($form_id, &$form, &$form_state) { // however, we'll skip this and let the calling function examine // the resulting $form_state bundle itself. if (!$form['#programmed'] && empty($form_state['rebuild']) && empty($form_state['storage'])) { - drupal_redirect_form($form, $form_state['redirect']); + drupal_redirect_form($form, $form_state['redirect']); } } } @@ -1432,7 +1432,7 @@ function theme_fieldset($element) { $element['#attributes']['class'] .= ' collapsible'; if ($element['#collapsed']) { - $element['#attributes']['class'] .= ' collapsed'; + $element['#attributes']['class'] .= ' collapsed'; } } diff --git a/includes/install.mysql.inc b/includes/install.mysql.inc index a6ebca079543b7eaad8509e5b349d44984c0022f..fa3b6d857dca84d5427bb43460bf185bb87b1e22 100644 --- a/includes/install.mysql.inc +++ b/includes/install.mysql.inc @@ -35,7 +35,7 @@ function drupal_test_mysql($url, &$success) { // Allow for non-standard MySQL port. if (isset($url['port'])) { - $url['host'] = $url['host'] .':'. $url['port']; + $url['host'] = $url['host'] .':'. $url['port']; } // Test connecting to the database. diff --git a/includes/language.inc b/includes/language.inc index c36ba7c014f55464f8e5e20b1733fd08025be765..15bb5a3d4e85e86bfe7b8d76b97088e28490b4e6 100644 --- a/includes/language.inc +++ b/includes/language.inc @@ -106,7 +106,7 @@ function language_url_rewrite(&$path, &$options) { if (!isset($options['language'])) { $options['language'] = $language; } - + switch (variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE)) { case LANGUAGE_NEGOTIATION_NONE: // No language dependent path allowed in this mode. diff --git a/includes/menu.inc b/includes/menu.inc index 7c19b1d8e6e1ab6e4a7871aece061454d685f28b..f1b375f52a6f355110ed5beb9e1c54af2c0edd6d 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -1792,8 +1792,8 @@ function menu_link_save(&$item) { } /** -* Helper function to clear the page and block caches at most twice per page load. -*/ + * Helper function to clear the page and block caches at most twice per page load. + */ function _menu_clear_page_cache() { static $cache_cleared = 0; @@ -1814,8 +1814,8 @@ function _menu_clear_page_cache() { } /** -* Helper function to update a list of menus with expanded items -*/ + * Helper function to update a list of menus with expanded items + */ function _menu_set_expanded_menus() { $names = array(); $result = db_query("SELECT menu_name FROM {menu_links} WHERE expanded != 0 GROUP BY menu_name"); diff --git a/includes/theme.inc b/includes/theme.inc index 43a33b3dfb831c601d76c8a4eedf14914594f56e..02697358598b07860e59ba47f3852aef54b03eab 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -1627,7 +1627,7 @@ function template_preprocess(&$variables, $hook) { // Tell all templates where they are located. $variables['directory'] = path_to_theme(); - + // Set default variables that depend on the database. $variables['is_admin'] = FALSE; $variables['is_front'] = FALSE; diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index 3570ede693252defa073b3d02ce1e1b484035c45..d56a7c89dc638f2bfd71ded393bf78e7c4946147 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -78,7 +78,7 @@ function _theme_load_offline_registry($theme, $base_theme = NULL, $theme_engine /** * Return a themed list of maintenance tasks to perform. - * + * * @ingroup themeable */ function theme_task_list($items, $active = NULL) { diff --git a/includes/xmlrpc.inc b/includes/xmlrpc.inc index 80d29fc0dcaf9727c0138b114404ac9c70e40da3..2bf8b18177cd70f68b96488757ccedadb47011b8 100644 --- a/includes/xmlrpc.inc +++ b/includes/xmlrpc.inc @@ -7,7 +7,7 @@ Site: http://scripts.incutio.com/xmlrpc/ Manual: http://scripts.incutio.com/xmlrpc/manual.php This version is made available under the GNU GPL License -*/ + */ /** * Recursively turn a data structure into objects with 'data' and 'type' attributes. diff --git a/includes/xmlrpcs.inc b/includes/xmlrpcs.inc index 7874091a21daea3d16fd9f9ba3812aff5e2fafc9..9b455c6397cd9f071f01ed1545bf7603e5ccca1a 100644 --- a/includes/xmlrpcs.inc +++ b/includes/xmlrpcs.inc @@ -55,7 +55,7 @@ function xmlrpc_server($callbacks) { $data = file_get_contents('php://input'); if (!$data) { - die('XML-RPC server accepts POST requests only.'); + die('XML-RPC server accepts POST requests only.'); } $xmlrpc_server->message = xmlrpc_message($data); if (!xmlrpc_message_parse($xmlrpc_server->message)) { diff --git a/modules/aggregator/aggregator.install b/modules/aggregator/aggregator.install index 5dbc4ddc9c1f297b1ca1656ec9ce4c818c3159c5..b49a4c96b6cd8073185b790df28fe49545bc2c14 100644 --- a/modules/aggregator/aggregator.install +++ b/modules/aggregator/aggregator.install @@ -73,7 +73,7 @@ function aggregator_schema() { 'not null' => TRUE, 'default' => 0, 'description' => t('The {aggregator_category}.cid to which the feed is being assigned.'), - ) + ) ), 'primary key' => array('fid', 'cid'), ); diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index b848b0eb5b0a9cdf4693f325502caf7debaccb26..ba330cd85c807c1aacbdc2e70dd86936787a67d5 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -577,7 +577,7 @@ function aggregator_refresh($feed) { case 302: case 307: // Filter the input data: - if (aggregator_parse_feed($result->data, $feed)) { + if (aggregator_parse_feed($result->data, $feed)) { $modified = empty($result->headers['Last-Modified']) ? 0 : strtotime($result->headers['Last-Modified']); diff --git a/modules/block/block.module b/modules/block/block.module index 002a890a4fe9397043847a160f6c4c97e6bd79b7..354d4528e80c7f3055f89fdc812866c6c8bf24a9 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -39,21 +39,21 @@ define('BLOCK_NO_CACHE', -1); /** -* The block can change depending on the roles the user viewing the page belongs to. -* This is the default setting, used when the block does not specify anything. -*/ + * The block can change depending on the roles the user viewing the page belongs to. + * This is the default setting, used when the block does not specify anything. + */ define('BLOCK_CACHE_PER_ROLE', 0x0001); /** -* The block can change depending on the user viewing the page. -* This setting can be resource-consuming for sites with large number of users, -* and thus should only be used when BLOCK_CACHE_PER_ROLE is not sufficient. -*/ + * The block can change depending on the user viewing the page. + * This setting can be resource-consuming for sites with large number of users, + * and thus should only be used when BLOCK_CACHE_PER_ROLE is not sufficient. + */ define('BLOCK_CACHE_PER_USER', 0x0002); /** -* The block can change depending on the page being viewed. -*/ + * The block can change depending on the page being viewed. + */ define('BLOCK_CACHE_PER_PAGE', 0x0004); /** diff --git a/modules/book/book.admin.inc b/modules/book/book.admin.inc index 22180e4d30be783a5288fbef5f1bb8aa9c13ff50..1fddfec4e6bee36da208016eecacab7c886cd60d 100644 --- a/modules/book/book.admin.inc +++ b/modules/book/book.admin.inc @@ -231,7 +231,7 @@ function theme_book_admin_table($form) { */ function _book_admin_sort_tree(&$tree) { uasort($tree, '_book_admin_compare'); - foreach($tree as $key => $subtree) { + foreach ($tree as $key => $subtree) { if (!empty($tree[$key]['below'])) { _book_admin_sort_tree($tree[$key]['below']); } diff --git a/modules/comment/comment.install b/modules/comment/comment.install index 0549195303ac8b9c5df57b8a433e3bcd279354a3..4cbc31fe5687785033ef34b779c506c3c47cf4ac 100644 --- a/modules/comment/comment.install +++ b/modules/comment/comment.install @@ -159,44 +159,44 @@ function comment_schema() { 'primary key' => array('cid'), ); - $schema['node_comment_statistics'] = array( - 'description' => t('Maintains statistics of node and comments posts to show "new" and "updated" flags.'), - 'fields' => array( - 'nid' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => t('The {node}.nid for which the statistics are compiled.'), - ), - 'last_comment_timestamp' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => t('The Unix timestamp of the last comment that was posted within this node, from {comments}.timestamp.'), - ), - 'last_comment_name' => array( - 'type' => 'varchar', - 'length' => 60, - 'not null' => FALSE, - 'description' => t('The name of the latest author to post a comment on this node, from {comments}.name.'), - ), - 'last_comment_uid' => array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => t('The user ID of the latest author to post a comment on this node, from {comments}.uid.'), - ), - 'comment_count' => array( - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - 'description' => t('The total number of comments on this node.'), - ), - ), - 'indexes' => array('node_comment_timestamp' => array('last_comment_timestamp')), - 'primary key' => array('nid'), + $schema['node_comment_statistics'] = array( + 'description' => t('Maintains statistics of node and comments posts to show "new" and "updated" flags.'), + 'fields' => array( + 'nid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + 'description' => t('The {node}.nid for which the statistics are compiled.'), + ), + 'last_comment_timestamp' => array( + 'type' => 'int', + 'not null' => TRUE, + 'default' => 0, + 'description' => t('The Unix timestamp of the last comment that was posted within this node, from {comments}.timestamp.'), + ), + 'last_comment_name' => array( + 'type' => 'varchar', + 'length' => 60, + 'not null' => FALSE, + 'description' => t('The name of the latest author to post a comment on this node, from {comments}.name.'), + ), + 'last_comment_uid' => array( + 'type' => 'int', + 'not null' => TRUE, + 'default' => 0, + 'description' => t('The user ID of the latest author to post a comment on this node, from {comments}.uid.'), + ), + 'comment_count' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + 'description' => t('The total number of comments on this node.'), + ), + ), + 'indexes' => array('node_comment_timestamp' => array('last_comment_timestamp')), + 'primary key' => array('nid'), ); return $schema; diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 4876fe638aa9d023f8811ee79edc1caa44f1a5e9..08cdfd8ea443c41c2681db9d27db1847c34d0b3c 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -1050,8 +1050,8 @@ function comment_operations($action = NULL) { } /** -*** misc functions: helpers, privates, history -**/ + * Misc functions: helpers, privates, history + */ /** * Load the entire comment by cid. @@ -1318,7 +1318,7 @@ function comment_form(&$form_state, $edit, $title = NULL) { if (!form_get_errors() && ((variable_get('comment_preview_'. $node->type, COMMENT_PREVIEW_REQUIRED) == COMMENT_PREVIEW_OPTIONAL) || ($op == t('Preview')) || ($op == t('Save')))) { $form['submit'] = array('#type' => 'submit', '#value' => t('Save'), '#weight' => 19); } - + $form['preview'] = array('#type' => 'button', '#value' => t('Preview'), '#weight' => 20); $form['#token'] = 'comment'. $edit['nid'] . (isset($edit['pid']) ? $edit['pid'] : ''); diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 4f4ed8240f7c689582d0008e3a6a4b204d5410b7..d87f715d2fb4bb5084ee6a096076d48d2648c788 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -274,7 +274,7 @@ function filter_filter_tips($delta, $format, $long = FALSE) { } break; case 2: - return t('Web page addresses and e-mail addresses turn into links automatically.'); + return t('Web page addresses and e-mail addresses turn into links automatically.'); } } diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 46f0a9615902afe449ed89f4f9e7373cc29a1b1d..c7f0e55cd46059ef2bc609433636a3f5bf7ed41a 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -190,7 +190,7 @@ function forum_nodeapi(&$node, $op, $teaser, $page) { if ($parents = taxonomy_get_parents_all($node->tid)) { $parents = array_reverse($parents); foreach ($parents as $p) { - $breadcrumb[] = l($p->name, 'forum/'.$p->tid); + $breadcrumb[] = l($p->name, 'forum/'. $p->tid); } } drupal_set_breadcrumb($breadcrumb); diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc index e441e3e3d04763ea53fab57d27ce5cb321d112ff..db9cebe9b6e113f96dd5d78c90ea591836663e77 100644 --- a/modules/node/node.admin.inc +++ b/modules/node/node.admin.inc @@ -384,7 +384,7 @@ function node_admin_nodes() { '#submit' => array('node_admin_nodes_submit'), ); - $languages = language_list(); + $languages = language_list(); $destination = drupal_get_destination(); $nodes = array(); while ($node = db_fetch_object($result)) { diff --git a/modules/node/node.module b/modules/node/node.module index e2a800bf85c6a725df76c4723c5eb934a170aafb..197cb12d612cd2ba60278d0a4d5f06f3c8912258 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -253,7 +253,7 @@ function node_teaser_js(&$form, &$form_state) { * @param $size * The desired character length of the teaser. If omitted, the default * value will be used. Ignored if the special delimiter is present - * in $body. + * in $body. * @return * The generated teaser. */ @@ -514,7 +514,7 @@ function _node_types_build() { // Types defined by the node module in the database (rather than by a separate // module using hook_node_info) have a module value of 'node'. if ($type_object->module != 'node' && empty($info_array[$type_object->type])) { - $type_object->disabled = TRUE; + $type_object->disabled = TRUE; } if (!isset($_node_types[$type_object->type]) || $type_object->modified) { $_node_types[$type_object->type] = $type_object; diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc index 975f3d8f61f7af302630c938a2df3b8154db47bd..71c458cb0b2f5e2205e536970093f244da811c92 100644 --- a/modules/node/node.pages.inc +++ b/modules/node/node.pages.inc @@ -384,10 +384,10 @@ function node_preview($node) { // 'teaser' form item). if (!isset($node->teaser)) { $node->teaser = empty($node->body) ? '' : node_teaser($node->body, $node->format); - // Chop off the teaser from the body if needed. - if (!$node->teaser_include && $node->teaser == substr($node->body, 0, strlen($node->teaser))) { - $node->body = substr($node->body, strlen($node->teaser)); - } + // Chop off the teaser from the body if needed. + if (!$node->teaser_include && $node->teaser == substr($node->body, 0, strlen($node->teaser))) { + $node->body = substr($node->body, strlen($node->teaser)); + } } // Display a preview of the node: diff --git a/modules/openid/openid.module b/modules/openid/openid.module index 98b7951891eed64e4c9fbdc356fe5c371405f883..30718d9c892ea344f5dfc816b6e76bfb74be4613 100644 --- a/modules/openid/openid.module +++ b/modules/openid/openid.module @@ -44,7 +44,7 @@ function openid_help($path, $arg) { case 'user/%/openid': $output = '

'. t('This site supports OpenID, a secure way to log into many websites using a single username and password. OpenID can reduce the necessity of managing many usernames and passwords for many websites.', array('@openid-net' => url('http://openid.net'))) .'

'; - $output .= '

' . t('To use OpenID you must first establish an identity on a public or private OpenID server. If you do not have an OpenID and would like one, look into one of the free public providers. You can find out more about OpenID at this website.', array('@openid-providers' => url('http://openid.net/wiki/index.php/OpenIDServers'), '@openid-net' => url('http://openid.net'))) .'

'; + $output .= '

'. t('To use OpenID you must first establish an identity on a public or private OpenID server. If you do not have an OpenID and would like one, look into one of the free public providers. You can find out more about OpenID at this website.', array('@openid-providers' => url('http://openid.net/wiki/index.php/OpenIDServers'), '@openid-net' => url('http://openid.net'))) .'

'; $output .= '

'. t('If you already have an OpenID, enter the URL to your OpenID server below (e.g. myusername.openidprovider.com). Next time you login, you will be able to use this URL instead of a regular username and password. You can have multiple OpenID servers if you like; just keep adding them here.') .'

'; return $output; diff --git a/modules/path/path.module b/modules/path/path.module index cbd30f4f0004cd1c0402989f061106b140da8db1..154e6065edf6d062aef6949c029cca37c0293944 100644 --- a/modules/path/path.module +++ b/modules/path/path.module @@ -117,7 +117,7 @@ function path_set_alias($path = NULL, $alias = NULL, $pid = NULL, $language = '' } else { db_query("DELETE FROM {url_alias} WHERE src = '%s'", $path); - } + } } drupal_clear_path_cache(); } diff --git a/modules/poll/poll.module b/modules/poll/poll.module index 586610553cad61e4543673646d4c03ed374bee16..920c1b3cc1878ea94e80eb8582ed77b50c436324 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -304,7 +304,7 @@ function _poll_choice_form($delta, $value = '', $votes = 0) { '#type' => 'textfield', '#title' => t('Choice @n', array('@n' => ($delta + 1))), '#default_value' => $value, - '#parents' => array('choice', $delta,'chtext'), + '#parents' => array('choice', $delta, 'chtext'), ); if ($admin) { diff --git a/modules/profile/profile.admin.inc b/modules/profile/profile.admin.inc index 4268c01a6a8c8e9ec8ccee7546c823864e140007..488666ed7eb79de35a9fe2904b423d877e576022 100644 --- a/modules/profile/profile.admin.inc +++ b/modules/profile/profile.admin.inc @@ -8,13 +8,13 @@ /** * Form builder to display a listing of all editable profile fields. - * + * * @ingroup forms * @see profile_admin_overview_submit(). */ function profile_admin_overview(&$form_state = NULL) { $result = db_query('SELECT title, name, type, category, fid, weight FROM {profile_fields} ORDER BY category, weight'); - + $form = array(); $categories = array(); while ($field = db_fetch_object($result)) { @@ -30,15 +30,15 @@ function profile_admin_overview(&$form_state = NULL) { $form[$field->fid]['edit'] = array('#value' => l(t('edit'), "admin/user/profile/edit/$field->fid")); $form[$field->fid]['delete'] = array('#value' => l(t('delete'), "admin/user/profile/delete/$field->fid")); } - + // Add the cateogory combo boxes $categories = array_unique($categories); - foreach($form as $fid => $field) { - foreach($categories as $cat => $category) { + foreach ($form as $fid => $field) { + foreach ($categories as $cat => $category) { $form[$fid]['category']['#options'][$category] = $category; } } - + // Display the submit button only when there's more than one field if (count($form) > 1) { $form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration')); @@ -51,7 +51,7 @@ function profile_admin_overview(&$form_state = NULL) { } } $form['#tree'] = TRUE; - + $addnewfields = '

'. t('Add new field') .'

'; $addnewfields .= '