diff options
author | Zach Copley <zach@controlyourself.ca> | 2009-06-17 18:49:25 -0700 |
---|---|---|
committer | Zach Copley <zach@controlyourself.ca> | 2009-06-17 18:49:25 -0700 |
commit | 6c7bdf9df67d02d26d3052e7fba5a80c482aacb8 (patch) | |
tree | 41bb18e5c8e3d873aefaf3a07bf9fd287f2aaeed /lib/mailbox.php | |
parent | 85b4c24188502ce3f8cef32cfba37ab91c8a648f (diff) | |
parent | 00736bddd199b2a43820367c3476b9e9ec84c0db (diff) |
Merge branch 'userdesign' into 0.8.x
* userdesign: (56 commits)
Fix for background image repetition for various page heights
Removed height:100% for better background image repetition
A little more specific selector for notice reply
Have user favorites page show user's design
Placed a check to make sure there is a reply button in a notice before
Make MailboxAction read only
Remove stale reference to deprecated personal.php
Uppercase hex color values
Default to image being on, no tile after upload
Fix sidebar color bug default design
Update background image settings to use bitflags
It was accidently removed
Dynamically tile background image and turn background image on or off
Show a background img in settings form
IE7/8 CSS update for user design
Enable tiling of background imgs for Designs
Added background image tile flag to Design
Init styles for tile and image use on/off for user design settings
Added form option to tile background image and to turn it on and off
Add background dir
...
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; + } + } |