diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/database.pear.inc | 2 | ||||
| -rw-r--r-- | includes/theme.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/database.pear.inc b/includes/database.pear.inc index 6ecc69519..8f9e21bff 100644 --- a/includes/database.pear.inc +++ b/includes/database.pear.inc @@ -20,7 +20,7 @@ function db_connect($url) { * * @param $query sql query * @param $type module type of this item - * @return sql result resource + * @return sql result resource */ function db_query($query) { $args = func_get_args(); diff --git a/includes/theme.inc b/includes/theme.inc index 63af790bc..0344195b2 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -116,7 +116,7 @@ function theme_blocks($region, &$theme) { global $id, $PHP_SELF, $user; $result = db_query("SELECT * FROM blocks WHERE (status = '1' OR custom = '1') ". ($region != "all" ? "AND region = '%s' " : "") ."ORDER BY weight, name", $region == "left" ? 0 : 1); - + while ($result && ($block = db_fetch_object($result))) { if (($block->status && (!$user->uid || !$block->custom)) || ($block->custom && $user->block[$block->name])) { $blocks = module_invoke($block->module, "block"); |