diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
| commit | ca489631db840e33757a71a7e4cb56b187c182d3 (patch) | |
| tree | 92c71b81b6870a8fd2d9c94bed8571b653d95413 /actions/showstream.php | |
| parent | 90c87553ee7566593529199374215ae80bb3e209 (diff) | |
| parent | 01637bcd32921d6857fb7f5c0bbd40fba6bdb830 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
Diffstat (limited to 'actions/showstream.php')
| -rw-r--r-- | actions/showstream.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/actions/showstream.php b/actions/showstream.php index 8178dafb1..71e10d4d1 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -54,7 +54,6 @@ require_once INSTALLDIR.'/lib/feedlist.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class ShowstreamAction extends ProfileAction { function isReadOnly($args) @@ -84,7 +83,6 @@ class ShowstreamAction extends ProfileAction function handle($args) { - // Looks like we're good; start output // For YADIS discovery, we also have a <meta> tag @@ -180,7 +178,6 @@ class ShowstreamAction extends ProfileAction $this->element('link', array('rel' => 'EditURI', 'type' => 'application/rsd+xml', 'href' => $rsd)); - } function showProfile() |