diff options
-rw-r--r-- | includes/database.pgsql.inc | 4 | ||||
-rw-r--r-- | includes/menu.inc | 16 | ||||
-rw-r--r-- | install.php | 2 | ||||
-rw-r--r-- | modules/comment/comment.module | 2 | ||||
-rw-r--r-- | modules/menu/menu.module | 4 | ||||
-rw-r--r-- | modules/node/node.module | 12 | ||||
-rw-r--r-- | modules/path/path.module | 4 | ||||
-rw-r--r-- | modules/system/system.install | 6 | ||||
-rw-r--r-- | modules/system/system.module | 18 | ||||
-rw-r--r-- | modules/translation/translation.module | 2 | ||||
-rw-r--r-- | modules/upload/upload.module | 4 | ||||
-rw-r--r-- | modules/user/user.module | 2 |
12 files changed, 38 insertions, 38 deletions
diff --git a/includes/database.pgsql.inc b/includes/database.pgsql.inc index b29983c48..051e8ea69 100644 --- a/includes/database.pgsql.inc +++ b/includes/database.pgsql.inc @@ -45,7 +45,7 @@ function db_version() { * Initialize a database connection. */ function db_connect($url) { - // Check if MySQL support is present in PHP + // Check if MySQL support is present in PHP if (!function_exists('pg_connect')) { drupal_maintenance_theme(); drupal_set_title('PHP PostgreSQL support not enabled'); @@ -630,7 +630,7 @@ function _db_create_field_sql($name, $spec) { } if (isset($spec['not null']) && $spec['not null']) { - $sql .= ' NOT NULL'; + $sql .= ' NOT NULL'; } if (isset($spec['default'])) { $default = is_string($spec['default']) ? "'". $spec['default'] ."'" : $spec['default']; diff --git a/includes/menu.inc b/includes/menu.inc index 0bf4a81e3..b77c45d18 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -1121,16 +1121,16 @@ function menu_tab_root_path() { * @ingroup themeable */ function theme_menu_local_tasks() { - $output = ''; + $output = ''; - if ($primary = menu_primary_local_tasks()) { - $output .= "<ul class=\"tabs primary\">\n". $primary ."</ul>\n"; - } - if ($secondary = menu_secondary_local_tasks()) { - $output .= "<ul class=\"tabs secondary\">\n". $secondary ."</ul>\n"; - } + if ($primary = menu_primary_local_tasks()) { + $output .= "<ul class=\"tabs primary\">\n". $primary ."</ul>\n"; + } + if ($secondary = menu_secondary_local_tasks()) { + $output .= "<ul class=\"tabs secondary\">\n". $secondary ."</ul>\n"; + } - return $output; + return $output; } /** diff --git a/install.php b/install.php index 8334327e8..28748d2e3 100644 --- a/install.php +++ b/install.php @@ -699,7 +699,7 @@ function install_tasks($profile, $task) { } } // Found nothing to import or not foreign language, go to next task. - $task = 'finished'; + $task = 'finished'; } // We are running a batch import of interface translation files. diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 6133ed164..ddc9b2347 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -136,7 +136,7 @@ function comment_help($path, $arg) { return '<p>'. t("Below is a list of the comments posted to your site that need approval. To approve a comment, click on 'edit' and then change its 'moderation status' to Approved. Click on a subject to see the comment, the author's name to edit the author's user information, 'edit' to modify the text, and 'delete' to remove their submission.") .'</p>'; case 'admin/content/comment/settings': return '<p>'. t("Comments can be attached to any node, and their settings are below. The display comes in two types: a 'flat list' where everything is flush to the left side, and comments come in chronological order, and a 'threaded list' where replies to other comments are placed immediately below and slightly indented, forming an outline. They also come in two styles: 'expanded', where you see both the title and the contents, and 'collapsed' where you only see the title. Preview comment forces a user to look at their comment by clicking on a 'Preview' button before they can actually add the comment.") .'</p>'; - } + } } /** diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 693f7e768..6058ffe5a 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -400,8 +400,8 @@ function menu_edit_menu(&$form_state, $type, $menu = array()) { '#title' => t('Title'), '#default_value' => $menu['title'], '#required' => TRUE, - ); - $form['description'] = array( + ); + $form['description'] = array( '#type' => 'textarea', '#title' => t('Description'), '#default_value' => $menu['description'], diff --git a/modules/node/node.module b/modules/node/node.module index 339e1dc2f..81d9722e4 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -2468,13 +2468,13 @@ function node_form_submit($form, &$form_state) { * Menu callback -- ask for confirmation of node deletion */ function node_delete_confirm(&$form_state, $node) { - $form['nid'] = array('#type' => 'value', '#value' => $node->nid); + $form['nid'] = array('#type' => 'value', '#value' => $node->nid); - return confirm_form($form, - t('Are you sure you want to delete %title?', array('%title' => $node->title)), - isset($_GET['destination']) ? $_GET['destination'] : 'node/'. $node->nid, - t('This action cannot be undone.'), - t('Delete'), t('Cancel')); + return confirm_form($form, + t('Are you sure you want to delete %title?', array('%title' => $node->title)), + isset($_GET['destination']) ? $_GET['destination'] : 'node/'. $node->nid, + t('This action cannot be undone.'), + t('Delete'), t('Cancel')); } /** diff --git a/modules/path/path.module b/modules/path/path.module index cd0643402..4b7c20916 100644 --- a/modules/path/path.module +++ b/modules/path/path.module @@ -94,8 +94,8 @@ function path_admin_delete_confirm($pid) { if (user_access('administer url aliases')) { $form['pid'] = array('#type' => 'value', '#value' => $pid); $output = confirm_form($form, - t('Are you sure you want to delete path alias %title?', array('%title' => $path['dst'])), - isset($_GET['destination']) ? $_GET['destination'] : 'admin/build/path'); + t('Are you sure you want to delete path alias %title?', array('%title' => $path['dst'])), + isset($_GET['destination']) ? $_GET['destination'] : 'admin/build/path'); } return $output; } diff --git a/modules/system/system.install b/modules/system/system.install index 525d66ceb..e09916ecf 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -958,9 +958,9 @@ function system_update_145() { $themes = list_themes(); if (!array_key_exists($default_theme, $themes)) { - variable_set('theme_default', 'garland'); - $default_theme = 'garland'; - } + variable_set('theme_default', 'garland'); + $default_theme = 'garland'; + } $ret = array(); diff --git a/modules/system/system.module b/modules/system/system.module index 7008353f2..a35d5480e 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -2122,15 +2122,15 @@ function system_modules_uninstall_submit($form, &$form_state) { * Menu callback: run cron manually. */ function system_run_cron() { - // Run cron manually - if (drupal_cron_run()) { - drupal_set_message(t('Cron ran successfully')); - } - else { - drupal_set_message(t('Cron run failed')); - } + // Run cron manually + if (drupal_cron_run()) { + drupal_set_message(t('Cron ran successfully')); + } + else { + drupal_set_message(t('Cron run failed')); + } - drupal_goto('admin/logs/status'); + drupal_goto('admin/logs/status'); } /** @@ -3054,7 +3054,7 @@ function system_message_action(&$object, $context = array()) { $variables = array( '%site_name' => variable_get('site_name', 'Drupal'), '%username' => $user->name ? $user->name : variable_get('anonymous', t('Anonymous')), - ); + ); // This action can be called in any context, but if placeholders // are used a node object must be present to be the source diff --git a/modules/translation/translation.module b/modules/translation/translation.module index 4fe79fba9..4197e2763 100644 --- a/modules/translation/translation.module +++ b/modules/translation/translation.module @@ -229,7 +229,7 @@ function translation_nodeapi(&$node, $op, $teaser, $page) { } switch ($op) { - case 'prepare': + case 'prepare': if (empty($node->nid) && isset($_GET['translation']) && isset($_GET['language']) && ($source_nid = $_GET['translation']) && ($language = $_GET['language']) && (user_access('translate content'))) { diff --git a/modules/upload/upload.module b/modules/upload/upload.module index 22419573c..5591c7fd1 100644 --- a/modules/upload/upload.module +++ b/modules/upload/upload.module @@ -494,8 +494,8 @@ function theme_upload_attachments($files) { $header = array(t('Attachment'), t('Size')); $rows = array(); foreach ($files as $file) { - $file = (object)$file; - if ($file->list && empty($file->remove)) { + $file = (object)$file; + if ($file->list && empty($file->remove)) { $href = file_create_url($file->filepath); $text = $file->description ? $file->description : $file->filename; $rows[] = array(l($text, $href), format_size($file->filesize)); diff --git a/modules/user/user.module b/modules/user/user.module index 20dc8fdeb..253141664 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -2865,7 +2865,7 @@ function user_autocomplete($string = '') { $result = db_query_range("SELECT name FROM {users} WHERE LOWER(name) LIKE LOWER('%s%%')", $string, 0, 10); while ($user = db_fetch_object($result)) { $matches[$user->name] = check_plain($user->name); - } + } } drupal_json($matches); |