Merge branch '0.7.x' into 0.8.x

[quix0rs-gnu-social.git] / actions / showfavorites.php

diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 035b899d270de51e1cf0a6119d9625463c44c901..e8cf1cb01cb1578eddd7223b5688d1f1f810bdea 100644 (file)
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -58,7 +58,7 @@ class ShowfavoritesAction extends Action
      * @return boolean true
      */
 
-    function isReadOnly()
+    function isReadOnly($args)
     {
         return true;
     }
@@ -169,11 +169,11 @@ class ShowfavoritesAction extends Action
             if ($this->user->id === $current_user->id) {
                 $message = _('You haven\'t chosen any favorite notices yet. Click the fave button on notices you like to bookmark them for later or shed a spotlight on them.');
             } else {
-                $message = sprintf(_('%s hasn\'t any notices to his favorites yet. Post something interesting they would add to their favorites :)'), $this->user->nickname);
+                $message = sprintf(_('%s hasn\'t added any notices to his favorites yet. Post something interesting they would add to their favorites :)'), $this->user->nickname);
             }
         }
         else {
-            $message = sprintf(_('%s hasn\'t any notices to his favorites yet. Why not [register an account](%%%%action.register%%%%) and then post something interesting they would add to thier favorites :)'), $this->user->nickname);
+            $message = sprintf(_('%s hasn\'t added any notices to his favorites yet. Why not [register an account](%%%%action.register%%%%) and then post something interesting they would add to thier favorites :)'), $this->user->nickname);
         }
 
         $this->elementStart('div', 'guide');
@@ -203,7 +203,7 @@ class ShowfavoritesAction extends Action
 
         $cnt = $nl->show();
         if (0 == $cnt) {
-            $this->showemptyListMessage();
+            $this->showEmptyListMessage();
         }
 
         $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,