diff options
| -rw-r--r-- | includes/locale.inc | 2 | ||||
| -rw-r--r-- | includes/node.inc | 2 | ||||
| -rw-r--r-- | modules/box.module | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/includes/locale.inc b/includes/locale.inc index 4fd927c56..8f4622a3f 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -7,7 +7,7 @@ function locale_init() { function t($string) { global $languages; - return ($languages ? locale($string) : $string); + return ($languages && function_exists("locale") ? locale($string) : $string); } ?>
\ No newline at end of file diff --git a/includes/node.inc b/includes/node.inc index 37e46f0b5..374732ae6 100644 --- a/includes/node.inc +++ b/includes/node.inc @@ -147,7 +147,7 @@ function node_save($node) { function node_invoke($node, $name, $arg = 0) { if ($node[type]) $function = $node[type] ."_$name"; if ($node->type) $function = $node->type ."_$name"; - if ($function) return ($arg ? $function($node, $arg) : $function($node)); + if (function_exists($function)) return ($arg ? $function($node, $arg) : $function($node)); } function node_view($node, $main = 0) { diff --git a/modules/box.module b/modules/box.module index bfd8b3d3c..789185cc5 100644 --- a/modules/box.module +++ b/modules/box.module @@ -35,7 +35,7 @@ function box_help() { } function box_block() { - $result = db_query("SELECT * FROM boxes"); + $result = db_query("SELECT * FROM boxes ORDER BY subject"); $i = 0; while ($block = db_fetch_object($result)) { $blocks[$i]["subject"] = check_output($block->subject); @@ -44,7 +44,6 @@ function box_block() { $blocks[$i]["link"] = check_output($block->link); $i++; } - return $blocks; } |