Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 6 insertions, 29 deletions

diff --git a/lib/stream.php b/lib/stream.php
index 27ab78137..0cb9e0bf4 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -10,11 +10,11 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.	 If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
 if (!defined('LACONICA')) { exit(1); }
@@ -22,33 +22,10 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/personal.php');
 require_once(INSTALLDIR.'/lib/noticelist.php');
 
-class StreamAction extends PersonalAction {
-
-	function public_views_menu() {
-
-		$action = $this->trimmed('action');
-
-		common_element_start('ul', array('id' => 'nav_views'));
-
-		common_menu_item(common_local_url('public'), _('Public'),
-			_('Public timeline'), $action == 'public');
-
-		common_menu_item(common_local_url('tag'), _('Recent tags'),
-			_('Recent tags'), $action == 'tag');
-
-		if (count(common_config('nickname', 'featured')) > 0) {
-			common_menu_item(common_local_url('featured'), _('Featured'),
-				_('Featured users'), $action == 'featured');
-		}
-
-		common_menu_item(common_local_url('favorited'), _('Popular'),
-			_("Popular notices"), $action == 'favorited');
-
-		common_element_end('ul');
-
-	}
-
-    function show_notice_list($notice) {
+class StreamAction extends PersonalAction
+{
+    function show_notice_list($notice)
+    {
         $nl = new NoticeList($notice);
         return $nl->show();
     }