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/galleryaction.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/galleryaction.php')
-rw-r--r-- | lib/galleryaction.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/galleryaction.php b/lib/galleryaction.php index 8fa11a756..498c82851 100644 --- a/lib/galleryaction.php +++ b/lib/galleryaction.php @@ -27,10 +27,9 @@ require_once INSTALLDIR.'/lib/profilelist.php'; define('AVATARS_PER_PAGE', 80); -class GalleryAction extends Action +class GalleryAction extends OwnerDesignAction { var $profile = null; - var $user = null; var $page = null; var $tag = null; |