- Patch #866220 by andypost: URL parameter for theme_more_link() should not pass url().

3 files changed, 4 insertions, 4 deletions

diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index a5ff986d7..95ab7674d 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -412,7 +412,7 @@ function aggregator_block_view($delta = '') {
         if ($feed = db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE block <> 0 AND fid = :fid', array(':fid' => $id))->fetchObject()) {
           $block['subject'] = check_plain($feed->title);
           $result = db_query_range("SELECT * FROM {aggregator_item} WHERE fid = :fid ORDER BY timestamp DESC, iid DESC", 0, $feed->block, array(':fid' => $id));
-          $read_more = theme('more_link', array('url' => url('aggregator/sources/' . $feed->fid), 'title' => t("View this feed's recent news.")));
+          $read_more = theme('more_link', array('url' => 'aggregator/sources/' . $feed->fid, 'title' => t("View this feed's recent news.")));
         }
         break;
 
@@ -420,7 +420,7 @@ function aggregator_block_view($delta = '') {
         if ($category = db_query('SELECT cid, title, block FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $id))->fetchObject()) {
           $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 = :cid ORDER BY i.timestamp DESC, i.iid DESC', 0, $category->block, array(':cid' => $category->cid));
-          $read_more = theme('more_link', array('url' => url('aggregator/categories/' . $category->cid), 'title' => t("View this category's recent news.")));
+          $read_more = theme('more_link', array('url' => 'aggregator/categories/' . $category->cid, 'title' => t("View this category's recent news.")));
         }
         break;
     }
diff --git a/modules/node/node.module b/modules/node/node.module
index 0161ca1ba..d74c1ce9e 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -2159,7 +2159,7 @@ function theme_node_recent_block($variables) {
   if ($rows) {
     $output = theme('table', array('rows' => $rows));
     if (user_access('access content overview')) {
-      $output .= theme('more_link', array('url' => url('admin/content'), 'title' => t('Show more content')));
+      $output .= theme('more_link', array('url' => 'admin/content', 'title' => t('Show more content')));
     }
   }
 
diff --git a/modules/simpletest/tests/theme_test.module b/modules/simpletest/tests/theme_test.module
index d11705bea..ad22367b8 100644
--- a/modules/simpletest/tests/theme_test.module
+++ b/modules/simpletest/tests/theme_test.module
@@ -32,7 +32,7 @@ function theme_test_init() {
   // variable. We will use this later in theme_test_hook_init_page_callback()
   // to test that even when the theme system is initialized this early, it is
   // still capable of returning output and theming the page as a whole.
-  $GLOBALS['theme_test_output'] = theme('more_link', array('url' => url('user'), 'title' => 'Themed output generated in hook_init()'));
+  $GLOBALS['theme_test_output'] = theme('more_link', array('url' => 'user', 'title' => 'Themed output generated in hook_init()'));
 }
 
 /**