diff options
| -rw-r--r-- | includes/common.inc | 13 | ||||
| -rw-r--r-- | modules/blog.module | 8 | ||||
| -rw-r--r-- | modules/blog/blog.module | 8 |
3 files changed, 15 insertions, 14 deletions
diff --git a/includes/common.inc b/includes/common.inc index 287b38e36..2531fc992 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -208,13 +208,13 @@ function drupal_not_found() { $status = MENU_NOT_FOUND; if ($path) { menu_set_active_item($path); - $status = menu_execute_active_handler(); + $return = menu_execute_active_handler(); } - if ($status != MENU_FOUND) { + if (empty($return)) { drupal_set_title(t('Page not found')); - print theme('page', ''); } + print theme('page', $return); } /** @@ -228,13 +228,14 @@ function drupal_access_denied() { $status = MENU_NOT_FOUND; if ($path) { menu_set_active_item($path); - $status = menu_execute_active_handler(); + $return = menu_execute_active_handler(); } - if ($status != MENU_FOUND) { + if (empty($return)) { drupal_set_title(t('Access denied')); - print theme('page', message_access()); + $return = message_access(); } + print theme('page', $return); } /** diff --git a/modules/blog.module b/modules/blog.module index faad60764..bbf4e4d22 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -102,17 +102,17 @@ function blog_page($a = NULL, $b = NULL) { if (is_numeric($a)) { // $a is a user ID if ($b == 'feed') { - blog_feed_user($a); + return blog_feed_user($a); } else { - blog_page_user($a); + return blog_page_user($a); } } else if ($a == 'feed') { - blog_feed_last(); + return blog_feed_last(); } else { - blog_page_last(); + return blog_page_last(); } } diff --git a/modules/blog/blog.module b/modules/blog/blog.module index faad60764..bbf4e4d22 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -102,17 +102,17 @@ function blog_page($a = NULL, $b = NULL) { if (is_numeric($a)) { // $a is a user ID if ($b == 'feed') { - blog_feed_user($a); + return blog_feed_user($a); } else { - blog_page_user($a); + return blog_page_user($a); } } else if ($a == 'feed') { - blog_feed_last(); + return blog_feed_last(); } else { - blog_page_last(); + return blog_page_last(); } } |