#147492 by flobruit: make 'more' links themeable

5 files changed, 19 insertions, 5 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 9275125d6..77aa900b9 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -2787,6 +2787,9 @@ function drupal_common_themes() {
     'feed_icon' => array(
       'arguments' => array('url' => NULL, 'title' => NULL),
     ),
+    'more_link' => array(
+      'arguments' => array('url' => NULL, 'title' => NULL)
+    ),
     'closure' => array(
       'arguments' => array('main' => 0),
     ),
diff --git a/includes/theme.inc b/includes/theme.inc
index 6f3dda76f..621b9e77d 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1561,6 +1561,18 @@ function theme_feed_icon($url, $title) {
 }
 
 /**
+ * Returns code that emits the 'more' link used on blocks.
+ *
+ * @param $url
+ *   The url of the main page
+ * @param $title
+ *   A descriptive verb for the link, like 'Read more'
+ */
+function theme_more_link($url, $title) {
+  return '<div class="more-link">'. t('<a href="@link" title="@title">more</a>', array('@link' => check_url($url), '@title' => $title)) .'</div>';
+}
+
+/**
  * Execute hook_footer() which is run at the end of the page right before the
  * close of the body tag.
  *
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index f64536930..ea59011e4 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -321,7 +321,7 @@ function aggregator_block($op = 'list', $delta = 0, $edit = array()) {
           if ($feed = db_fetch_object(db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE fid = %d', $id))) {
             $block['subject'] = check_plain($feed->title);
             $result = db_query_range('SELECT * FROM {aggregator_item} WHERE fid = %d ORDER BY timestamp DESC, iid DESC', $feed->fid, 0, $feed->block);
-            $read_more = '<div class="more-link">'. l(t('more'), 'aggregator/sources/'. $feed->fid, array('title' => t("View this feed's recent news."))) .'</div>';
+            $read_more = theme('more_link', url('aggregator/sources/'. $feed->fid), t("View this feed's recent news.")); 
           }
           break;
 
@@ -329,7 +329,7 @@ function aggregator_block($op = 'list', $delta = 0, $edit = array()) {
           if ($category = db_fetch_object(db_query('SELECT cid, title, block FROM {aggregator_category} WHERE cid = %d', $id))) {
             $block['subject'] = check_plain($category->title);
             $result = db_query_range('SELECT i.* FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON ci.iid = i.iid WHERE ci.cid = %d ORDER BY i.timestamp DESC, i.iid DESC', $category->cid, 0, $category->block);
-            $read_more = '<div class="more-link">'. l(t('more'), 'aggregator/categories/'. $category->cid, array('title' => t("View this category's recent news."))) .'</div>';
+            $read_more = theme('more_link', url('aggregator/categories/'. $category->cid), t("View this category's recent news."));
           }
           break;
       }
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index 2784d720d..53dbbc716 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -192,7 +192,7 @@ function blog_block($op = 'list', $delta = 0) {
       $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'] .= '<div class="more-link">'. l(t('more'), 'blog', array('title' => t('Read the latest blog entries.'))) .'</div>';
+        $block['content'] .= theme('more_link', url('blog'), t('Read the latest blog entries.'));
         $block['subject'] = t('Recent blog posts');
         return $block;
       }
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index a52dcb5e9..600ae5a46 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -413,9 +413,8 @@ function forum_block($op = 'list', $delta = 0, $edit = array()) {
         }
 
         if (!empty($content)) {
-          $content .= '<div class="more-link">'. l(t('more'), 'forum', array('title' => t('Read the latest forum topics.'))) .'</div>';
           $block['subject'] = $title;
-          $block['content'] = $content;
+          $block['content'] = $content . theme('more_link', url('forum'), t('Read the latest forum topics.'));
           return $block;
         }
       }