Merge branch '0.9.x' 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));
+        }
     }
 
     /**

plugins/TwitterBridge/TwitterBridgePlugin.php

@@ -127,7 +127,12 @@ class TwitterBridgePlugin extends Plugin
      */
     function onStartEnqueueNotice($notice, &$transports)
     {
+        // Avoid a possible loop
+
+        if ($notice->source != 'twitter') {
             array_push($transports, 'twitter');
+        }
+
         return true;
     }
 

plugins/TwitterBridge/daemons/twitterstatusfetcher.php

@@ -209,7 +209,11 @@ class TwitterStatusFetcher extends ParallelizingDaemon
                 continue;
             }
 
-            $this->saveStatus($status, $flink);
+            $notice = null;
+
+            $notice = $this->saveStatus($status, $flink);
+
+            common_broadcast_notice($notice);
         }
 
         // Okay, record the time we synced with Twitter for posterity
@@ -235,12 +239,14 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         $uri = 'http://twitter.com/' . $status->user->screen_name .
             '/status/' . $status->id;
 
-        $notice = Notice::staticGet('uri', $uri);
-
         // check to see if we've already imported the status
 
+        $notice = Notice::staticGet('uri', $uri);
+
         if (empty($notice)) {
 
+            // XXX: transaction here?
+
             $notice = new Notice();
 
             $notice->profile_id = $id;
@@ -257,6 +263,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
                 $id = $notice->insert();
                 Event::handle('EndNoticeSave', array($notice));
             }
+
         }
 
         if (!Notice_inbox::pkeyGet(array('notice_id' => $notice->id,
@@ -270,7 +277,12 @@ class TwitterStatusFetcher extends ParallelizingDaemon
             $inbox->source    = NOTICE_INBOX_SOURCE_GATEWAY; // From a private source
 
             $inbox->insert();
+
         }
+
+        $notice->blowCaches();
+
+        return $notice;
     }
 
     function ensureProfile($user)