diff options
author | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
commit | b5cfcba4712809cb17eabba299ce5ff04f4d7d70 (patch) | |
tree | 38235bafd6ddf194e484b97321c0c341bea9de38 /plugins/SubMirror/actions/mirrorsettings.php | |
parent | 91a186251047127ad7f1238f47ff761d9127627c (diff) | |
parent | f0105893b0b78ff88d08cc2417773ad8a44dc2fa (diff) |
Merge branch '0.9.x' into activityexport
Conflicts:
plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'plugins/SubMirror/actions/mirrorsettings.php')
-rw-r--r-- | plugins/SubMirror/actions/mirrorsettings.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/SubMirror/actions/mirrorsettings.php b/plugins/SubMirror/actions/mirrorsettings.php index 5463a8dc0..a828b26fe 100644 --- a/plugins/SubMirror/actions/mirrorsettings.php +++ b/plugins/SubMirror/actions/mirrorsettings.php @@ -36,9 +36,9 @@ class MirrorSettingsAction extends AccountSettingsAction * * @return string Page title */ - function title() { + // TRANS: Title. return _m('Feed mirror settings'); } @@ -50,6 +50,7 @@ class MirrorSettingsAction extends AccountSettingsAction function getInstructions() { + // TRANS: Instructions. return _m('You can mirror updates from many RSS and Atom feeds ' . 'into your StatusNet timeline!'); } @@ -61,13 +62,12 @@ class MirrorSettingsAction extends AccountSettingsAction * * @return void */ - function showContent() { $user = common_current_user(); $this->showAddFeedForm(); - + $mirror = new SubMirror(); $mirror->subscriber = $user->id; if ($mirror->find()) { @@ -99,7 +99,6 @@ class MirrorSettingsAction extends AccountSettingsAction * * @return void */ - function handlePost() { } |