Merge commit 'refs/merge-requests/108' of git://gitorious.org/statusnet/mainline into 0.9.x

EVENTS.txt

@@ -574,3 +574,24 @@ EndShortenUrl: After a URL has been shortened
 - $shortenerName: name of the requested shortener
 - $shortenedUrl: short version of the url
 
+StartCssLinkElement: Before a <link rel="stylesheet"..> element is written
+- $action
+- &$src
+- &$theme
+- &$media
+
+EndCssLinkElement: After a <link rel="stylesheet"..> element is written
+- $action
+- $src
+- $theme
+- $media
+
+StartScriptElement: Before a <script...> element is written
+- $action
+- &$src
+- &$type
+
+EndScriptElement: After a <script...> element is written
+- $action
+- $src
+- $type

lib/htmloutputter.php

@@ -350,6 +350,7 @@ class HTMLOutputter extends XMLOutputter
      */
     function script($src, $type='text/javascript')
     {
+        if(Event::handle('StartScriptElement', array($this,&$src,&$type))) {
             $url = parse_url($src);
             if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment))
             {
@@ -358,6 +359,8 @@ class HTMLOutputter extends XMLOutputter
             $this->element('script', array('type' => $type,
                                                    'src' => $src),
                                    ' ');
+            Event::handle('EndScriptElement', array($this,$src,$type));
+        }
     }
 
     /**
@@ -390,6 +393,7 @@ class HTMLOutputter extends XMLOutputter
      */
     function cssLink($src,$theme=null,$media=null)
     {
+        if(Event::handle('StartCssLinkElement', array($this,&$src,&$theme,&$media))) {
             $url = parse_url($src);
             if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment))
             {
@@ -403,6 +407,8 @@ class HTMLOutputter extends XMLOutputter
                                     'type' => 'text/css',
                                     'href' => $src,
                                     'media' => $media));
+            Event::handle('EndCssLinkElement', array($this,$src,$theme,$media));
+        }
     }
 
     /**