- Patch #345866 by alexanderpas, justinrandell, Dave Reid: remove from hook_block().

1 files changed, 18 insertions, 15 deletions

diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index e9b036c13..0fe3c3190 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -165,25 +165,28 @@ function _blog_post_exists($account) {
 }
 
 /**
- * Implementation of hook_block().
+ * Implementation of hook_block_list().
+ */
+function blog_block_list() {
+  $block['recent']['info'] = t('Recent blog posts');
+  return $block;
+}
+
+/**
+ * Implementation of hook_block_view().
  *
  * Displays the most recent 10 blog titles.
  */
-function blog_block($op = 'list', $delta = '') {
+function blog_block_view($delta = '') {
   global $user;
-  if ($op == 'list') {
-    $block['recent']['info'] = t('Recent blog posts');
-    return $block;
-  }
-  elseif ($op == 'view') {
-    if (user_access('access content')) {
-      $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, 10);
-      if ($node_title_list = node_title_list($result)) {
-        $block['content'] = $node_title_list;
-        $block['content'] .= theme('more_link', url('blog'), t('Read the latest blog entries.'));
-        $block['subject'] = t('Recent blog posts');
-        return $block;
-      }
+
+  if (user_access('access content')) {
+    $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, 10);
+    if ($node_title_list = node_title_list($result)) {
+      $block['content'] = $node_title_list;
+      $block['content'] .= theme('more_link', url('blog'), t('Read the latest blog entries.'));
+      $block['subject'] = t('Recent blog posts');
+      return $block;
     }
   }
 }