Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

diff --git a/lib/featureduserssection.php b/lib/featureduserssection.php
index 2935d83630ff3110ab64f607b675912da3dbe9d6..aed94b1a555e845b36c7fd23513fd90b0a9756cc 100644 (file)
--- a/lib/featureduserssection.php
+++ b/lib/featureduserssection.php
@@ -86,4 +86,9 @@ class FeaturedUsersSection extends ProfileSection
     {
         return 'featured_users';
     }
+
+    function moreUrl()
+    {
+        return common_local_url('featured');
+    }
 }

diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index 5734d800189d9bdd7be139d85aef94775b8b53c7..5380563b9e70ee48cb8590bc376d39b16cbb20fd 100644 (file)
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -80,4 +80,9 @@ class PopularNoticeSection extends NoticeSection
     {
         return 'popular_notices';
     }
+
+    function moreUrl()
+    {
+        return common_local_url('favorited');
+    }
 }

diff --git a/lib/section.php b/lib/section.php
index 0c32ddcf84e91a5696e5ea32cb29d4f45108995d..d145750862a504ec10d1e912e1f4a4c709624040 100644 (file)
--- a/lib/section.php
+++ b/lib/section.php
@@ -103,6 +103,6 @@ class Section extends Widget
 
     function moreTitle()
     {
-        return null;
+        return _('More...');
     }
 }