diff options
author | Jeffery To <jeffery.to@gmail.com> | 2009-06-24 01:25:55 +0800 |
---|---|---|
committer | Jeffery To <jeffery.to@gmail.com> | 2009-06-24 01:25:55 +0800 |
commit | 280f8faab4f692ff7f4389f82397adfa6db56325 (patch) | |
tree | 94a076bfb3d13c7e6699e0149ee75fff6801880c /lib/mailbox.php | |
parent | bb3361467c002e38aa3a424672f332b32a647e17 (diff) | |
parent | eb40fbc17ad1efb0a4c51ee00b1e9408d2af382f (diff) |
Merge branch '0.8.x' into small-fixes
Conflicts:
lib/peoplesearchresults.php
lib/profilelist.php
Diffstat (limited to 'lib/mailbox.php')
-rw-r--r-- | lib/mailbox.php | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/lib/mailbox.php b/lib/mailbox.php index 01bbf5721..f1f6e98c1 100644 --- a/lib/mailbox.php +++ b/lib/mailbox.php @@ -31,8 +31,6 @@ if (!defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/personal.php'; - define('MESSAGES_PER_PAGE', 20); /** @@ -47,11 +45,11 @@ define('MESSAGES_PER_PAGE', 20); * @see OutboxAction */ -class MailboxAction extends PersonalAction +class MailboxAction extends CurrentUserDesignAction { var $page = null; - function prepare($args) + function prepare($args) { parent::prepare($args); @@ -265,12 +263,12 @@ class MailboxAction extends PersonalAction * Returns either the name (and link) of the API client that posted the notice, * or one of other other channels. * - * @param string $source the source of the message + * @param string $source the source of the message * * @return void */ - function showSource($source) + function showSource($source) { $source_name = _($source); switch ($source) { @@ -297,4 +295,17 @@ class MailboxAction extends PersonalAction return; } + /** + * Mailbox actions are read only + * + * @param array $args other arguments + * + * @return boolean + */ + + function isReadOnly($args) + { + return true; + } + } |