diff options
| author | Dries Buytaert <dries@buytaert.net> | 2004-08-21 15:57:25 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2004-08-21 15:57:25 +0000 |
| commit | d619ccc87e4e12b6325500d7fbd51d835d27b72b (patch) | |
| tree | dc82abfac76edd5609bea0ef5471f7b5638ae032 | |
| parent | cfe20d0b8e2e2ea752f0572b8b64cd995fc5159e (diff) | |
| download | brdo-d619ccc87e4e12b6325500d7fbd51d835d27b72b.tar.gz brdo-d619ccc87e4e12b6325500d7fbd51d835d27b72b.tar.bz2 | |
- Patch #10247 by Bart Jansens: bugfixes: added some missing braces and changed the default value in one variable_get so the same default value is used everywhere.
| -rw-r--r-- | modules/filter.module | 4 | ||||
| -rw-r--r-- | modules/filter/filter.module | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/filter.module b/modules/filter.module index 84b122244..1dcc1c59f 100644 --- a/modules/filter.module +++ b/modules/filter.module @@ -430,7 +430,7 @@ function filter_admin_order() { function filter_admin_order_save($format, $weights) { foreach ($weights as $id => $weight) { list($module, $delta) = explode('/', $id); - db_query("UPDATE filters SET weight = %d WHERE format = %d AND module = '%s' AND delta = %d", $weight, $format, $module, $delta); + db_query("UPDATE {filters} SET weight = %d WHERE format = %d AND module = '%s' AND delta = %d", $weight, $format, $module, $delta); } drupal_set_message(t('The filter weights have been saved.')); @@ -648,7 +648,7 @@ function filter_form($name, $value = FILTER_FORMAT_DEFAULT) { // Only one format available: use a hidden form item and only show tips. $format = array_shift($formats); $output = form_hidden($name, $format->format); - $tips = _filter_tips(variable_get('filter_default_format', 0), false); + $tips = _filter_tips(variable_get('filter_default_format', 1), false); $output .= form_item(t('Formatting guidelines'), theme('filter_tips', $tips, $extra), $extra); return $output; } diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 84b122244..1dcc1c59f 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -430,7 +430,7 @@ function filter_admin_order() { function filter_admin_order_save($format, $weights) { foreach ($weights as $id => $weight) { list($module, $delta) = explode('/', $id); - db_query("UPDATE filters SET weight = %d WHERE format = %d AND module = '%s' AND delta = %d", $weight, $format, $module, $delta); + db_query("UPDATE {filters} SET weight = %d WHERE format = %d AND module = '%s' AND delta = %d", $weight, $format, $module, $delta); } drupal_set_message(t('The filter weights have been saved.')); @@ -648,7 +648,7 @@ function filter_form($name, $value = FILTER_FORMAT_DEFAULT) { // Only one format available: use a hidden form item and only show tips. $format = array_shift($formats); $output = form_hidden($name, $format->format); - $tips = _filter_tips(variable_get('filter_default_format', 0), false); + $tips = _filter_tips(variable_get('filter_default_format', 1), false); $output .= form_item(t('Formatting guidelines'), theme('filter_tips', $tips, $extra), $extra); return $output; } |