diff options
author | Brion Vibber <brion@pobox.com> | 2010-05-06 18:49:01 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-05-06 18:49:01 -0700 |
commit | d9c1ac9053ee3e4ddb861d1467bb065a4bfab3bf (patch) | |
tree | e54220748cb5f22abfe555c69b9f46f567cb2933 /plugins | |
parent | 3e8af172d636cc7ca3a9e2301b928f6ca79b9eb2 (diff) | |
parent | d57e1deaec7406c63f70b8a5664746d18c1125ff (diff) |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/MobileProfile/MobileProfilePlugin.php | 5 | ||||
-rw-r--r-- | plugins/OStatus/OStatusPlugin.php | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index 1c61b4fe5..6076bbde0 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -138,6 +138,7 @@ class MobileProfilePlugin extends WAP20Plugin 'vodafone', 'wap1', 'wap2', + 'webos', 'windows ce' ); @@ -254,6 +255,10 @@ class MobileProfilePlugin extends WAP20Plugin $action->cssLink('plugins/MobileProfile/mp-handheld.css',null,'handheld'); } + // Allow other plugins to load their styles. + Event::handle('EndShowStatusNetStyles', array($action)); + Event::handle('EndShowLaconicaStyles', array($action)); + return false; } diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index f183bc7ae..d3a92755c 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -452,6 +452,7 @@ class OStatusPlugin extends Plugin return false; } } + return true; } /** |