diff options
| -rw-r--r-- | includes/database.inc | 4 | ||||
| -rw-r--r-- | includes/install.inc | 4 | ||||
| -rw-r--r-- | includes/theme.inc | 2 | ||||
| -rw-r--r-- | modules/comment/comment.module | 2 | ||||
| -rw-r--r-- | update.php | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/includes/database.inc b/includes/database.inc index 142466536..7e3a98368 100644 --- a/includes/database.inc +++ b/includes/database.inc @@ -476,14 +476,14 @@ function _db_type_placeholder($type) { // presumably no db's "escape string" function will mess with // those characters. return '%s'; - + case 'serial': case 'int': return '%d'; case 'float': return '%f'; - + case 'blob': return '%b'; } diff --git a/includes/install.inc b/includes/install.inc index 8676b03bc..73ce2c263 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -353,7 +353,7 @@ function drupal_install_modules($module_list = array()) { function drupal_uninstall_module($module) { module_load_install($module); module_invoke($module, 'uninstall'); - + // Remove menu links for paths declared by this module. drupal_load('module', $module); $paths = module_invoke($module, 'menu'); @@ -370,7 +370,7 @@ function drupal_uninstall_module($module) { $paths[$index] = implode('/', $parts); } $placeholders = implode(', ', array_fill(0, count($paths), "'%s'")); - + $result = db_query('SELECT * FROM {menu_links} WHERE router_path IN ('. $placeholders .') AND external = 0 ORDER BY depth DESC', $paths); // Remove all such items. Starting from those with the greatest depth will // minimize the amount of re-parenting done by menu_link_delete(). diff --git a/includes/theme.inc b/includes/theme.inc index 111593e5a..542721b85 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -1609,7 +1609,7 @@ function template_preprocess(&$variables, $hook) { static $count = array(); // Track run count for each hook to provide zebra striping. - // See "template_preprocess_block()" which provides the same feature for sidebar blocks. + // See "template_preprocess_block()" which provides the same feature for sidebar blocks. $count[$hook] = isset($count[$hook]) && is_int($count[$hook]) ? $count[$hook] : 1; $variables['zebra'] = ($count[$hook] % 2) ? 'odd' : 'even'; $variables['id'] = $count[$hook]++; diff --git a/modules/comment/comment.module b/modules/comment/comment.module index ca3661020..73381d211 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -814,7 +814,7 @@ function comment_save($edit) { drupal_set_message(t('Your comment has been queued for moderation by site administrators and will be published after approval.')); } else { - comment_invoke_comment($edit, 'publish'); + comment_invoke_comment($edit, 'publish'); } return $edit['cid']; } diff --git a/update.php b/update.php index 393b3fdf7..6975fefba 100644 --- a/update.php +++ b/update.php @@ -60,11 +60,11 @@ function db_add_column(&$ret, $table, $column, $type, $attributes = array()) { $ret[] = update_sql("ALTER TABLE {". $table ."} ADD $column $type"); if (!empty($default)) { - $ret[] = update_sql("ALTER TABLE {". $table ."} ALTER $column SET $default"); + $ret[] = update_sql("ALTER TABLE {". $table ."} ALTER $column SET $default"); } if (!empty($not_null)) { - if (!empty($default)) { - $ret[] = update_sql("UPDATE {". $table ."} SET $column = $default_val"); + if (!empty($default)) { + $ret[] = update_sql("UPDATE {". $table ."} SET $column = $default_val"); } $ret[] = update_sql("ALTER TABLE {". $table ."} ALTER $column SET NOT NULL"); } |