Merge branch 'testing' into 0.9.x

2010-05-06 18:48:39 -07:00
parent 869bc32d0d 7915386950
commit d57e1deaec
1 changed files with 5 additions and 0 deletions
--- 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;
    }