diff options
author | Evan Prodromou <evan@status.net> | 2010-08-03 16:04:54 -0700 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-08-03 16:04:54 -0700 |
commit | 004e42e3e0606f0f9e5c8b6cd4512e5d870cd56e (patch) | |
tree | ab895f7609c8afeeadf3439c860b69d0cffcbb5e /lib/action.php | |
parent | d2234580357349a6887a2321e69d11de7bb29106 (diff) | |
parent | fdd9aa58e3caf87096e1c1dcfa8b2f286b04e4b1 (diff) |
Merge remote branch 'gitorious/1.0.x' into 1.0.x
Diffstat (limited to 'lib/action.php')
-rw-r--r-- | lib/action.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/action.php b/lib/action.php index 4296ae7de..2b3b707c5 100644 --- a/lib/action.php +++ b/lib/action.php @@ -235,6 +235,16 @@ class Action extends HTMLOutputter // lawsuit Event::handle('EndShowDesign', array($this)); } Event::handle('EndShowStyles', array($this)); + + if (common_config('custom_css', 'enabled')) { + $css = common_config('custom_css', 'css'); + if (Event::handle('StartShowCustomCss', array($this, &$css))) { + if (trim($css) != '') { + $this->style($css); + } + Event::handle('EndShowCustomCss', array($this)); + } + } } } @@ -467,7 +477,7 @@ class Action extends HTMLOutputter // lawsuit _m('MENU', 'Logout'), $tooltip, false, 'nav_logout'); } else { - if (!common_config('site', 'closed')) { + if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) { // TRANS: Tooltip for main menu option "Register" $tooltip = _m('TOOLTIP', 'Create an account'); $this->menuItem(common_local_url('register'), |