diff options
| -rw-r--r-- | includes/common.inc | 2 | ||||
| -rw-r--r-- | modules/cloud.module | 4 | ||||
| -rw-r--r-- | modules/taxonomy.module | 20 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 20 |
4 files changed, 29 insertions, 17 deletions
diff --git a/includes/common.inc b/includes/common.inc index 2f8994495..82674223e 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -513,7 +513,7 @@ function format_interval($timestamp) { function format_date($timestamp, $type = "medium", $format = "") { global $user; - // $timestamp += ($user->timezone) ? $user->timezone - date("Z") : 0; + $timestamp += ($user->timezone) ? $user->timezone - date("Z") : 0; switch ($type) { case "small": diff --git a/modules/cloud.module b/modules/cloud.module index 8acc5c4b0..8575b342f 100644 --- a/modules/cloud.module +++ b/modules/cloud.module @@ -47,11 +47,11 @@ function cloud_update($site) { ** Check whether the site is properly configured: */ - if (!ereg("^http://|https://|ftp://", $site[link])) { + if (!ereg("^http://|https://|ftp://", $site["link"])) { watchdog("warning", "cloud: invalid or missing URL for '". $site["name"] ."'"); } - if (!ereg("^http://|https://|ftp://", $site[feed])) { + if (!ereg("^http://|https://|ftp://", $site["feed"])) { watchdog("warning", "cloud: invalid or missing URL to monitor for '". $site["name"] ."'"); } diff --git a/modules/taxonomy.module b/modules/taxonomy.module index 265b566d0..dacca431a 100644 --- a/modules/taxonomy.module +++ b/modules/taxonomy.module @@ -570,19 +570,23 @@ function taxonomy_admin() { switch ($op) { case "add": - if ($type == "vocabulary") + if ($type == "vocabulary") { print taxonomy_form_vocabulary(); - else + } + else { print taxonomy_form_term(); + } break; case "edit": - if ($type == "vocabulary") + if ($type == "vocabulary") { print taxonomy_form_vocabulary(object2array(taxonomy_get_vocabulary($id))); - else + } + else { print taxonomy_form_term(object2array(taxonomy_get_term($id))); + } break; case "preview": - print taxonomy_form($id); + print taxonomy_form($id); break; case "help": print taxonomy_help(); @@ -591,10 +595,12 @@ function taxonomy_admin() { $edit["name"] = 0; // fall through: case "Submit": - if ($type == "vocabulary") + if ($type == "vocabulary") { print status(taxonomy_save_vocabulary($edit)); - else + } + else { print status(taxonomy_save_term($edit)); + } // fall through: default: print taxonomy_overview(); diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 265b566d0..dacca431a 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -570,19 +570,23 @@ function taxonomy_admin() { switch ($op) { case "add": - if ($type == "vocabulary") + if ($type == "vocabulary") { print taxonomy_form_vocabulary(); - else + } + else { print taxonomy_form_term(); + } break; case "edit": - if ($type == "vocabulary") + if ($type == "vocabulary") { print taxonomy_form_vocabulary(object2array(taxonomy_get_vocabulary($id))); - else + } + else { print taxonomy_form_term(object2array(taxonomy_get_term($id))); + } break; case "preview": - print taxonomy_form($id); + print taxonomy_form($id); break; case "help": print taxonomy_help(); @@ -591,10 +595,12 @@ function taxonomy_admin() { $edit["name"] = 0; // fall through: case "Submit": - if ($type == "vocabulary") + if ($type == "vocabulary") { print status(taxonomy_save_vocabulary($edit)); - else + } + else { print status(taxonomy_save_term($edit)); + } // fall through: default: print taxonomy_overview(); |