diff --git a/plugins/SlicedFavorites/SlicedFavoritesPlugin.php b/plugins/SlicedFavorites/SlicedFavoritesPlugin.php index ed7f5ebb96..75b9847f44 100644 --- a/plugins/SlicedFavorites/SlicedFavoritesPlugin.php +++ b/plugins/SlicedFavorites/SlicedFavoritesPlugin.php @@ -33,13 +33,13 @@ class SlicedFavoritesPlugin extends Plugin * 'slices' => array( * // show only pop's notices on /favorited * 'default' => array('include' => array('pop')), - * + * * // show only son's notices on /favorited/blog * 'blog' => array('include' => array('son')), - * + * * // show all favorited notices except pop's and son's on /favorited/submitted * 'submitted' => array('exclude' => array('pop', 'son')), - * + * * // show all favorited notices on /favorited/everybody * 'everybody' => array(), * ) @@ -106,4 +106,31 @@ class SlicedFavoritesPlugin extends Plugin } return true; } + + /** + * Provide plugin version information. + * + * This data is used when showing the version page. + * + * @param array &$versions array of version data arrays; see EVENTS.txt + * + * @return boolean hook value + * @todo Needs a proper plugin description. + */ +/* + function onPluginVersion(&$versions) + { + $url = 'http://status.net/wiki/Plugin:SlicedFavorites'; + + $versions[] = array('name' => 'SlicedFavorites', + 'version' => STATUSNET_VERSION, + 'author' => 'Brion Vibber', + 'homepage' => $url, + 'rawdescription' => + // TRANS: Plugin description. + _m('Needs a proper plugin description.')); + + return true; + } +*/ } diff --git a/plugins/SlicedFavorites/favoritedsliceaction.php b/plugins/SlicedFavorites/favoritedsliceaction.php index 020688cfa4..9c8a9f53fb 100644 --- a/plugins/SlicedFavorites/favoritedsliceaction.php +++ b/plugins/SlicedFavorites/favoritedsliceaction.php @@ -32,7 +32,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } - class FavoritedSliceAction extends FavoritedAction { private $includeUsers = array(), $excludeUsers = array(); @@ -46,7 +45,6 @@ class FavoritedSliceAction extends FavoritedAction * * @todo move queries from showContent() to here */ - function prepare($args) { parent::prepare($args); @@ -54,6 +52,7 @@ class FavoritedSliceAction extends FavoritedAction $this->slice = $this->arg('slice', 'default'); $data = array(); if (Event::handle('SlicedFavoritesGetSettings', array($this->slice, &$data))) { + // TRANS: Client exception. throw new ClientException(_m('Unknown favorites slice.')); } if (isset($data['include'])) { @@ -73,7 +72,6 @@ class FavoritedSliceAction extends FavoritedAction * * @return void */ - function showContent() { $slice = $this->sliceWhereClause();