Merge branch 'testing' into pluginstatic

This commit is contained in:
Evan Prodromou 2011-02-03 11:42:58 -05:00
commit 26f0a24ab6

View File

@ -326,7 +326,7 @@ class NewMenuPlugin extends Plugin
function onEndShowStyles($action)
{
if (($this->showCSS ||
if (($this->loadCSS ||
in_array(common_config('site', 'theme'),
array('default', 'identica', 'h4ck3r'))) &&
($action instanceof AccountSettingsAction ||