svn commit: r811658 - /incubator/shindig/trunk/php/src/gadgets/render/GadgetBaseRenderer.php

[chabotc]

Author: chabotc
Date: Sat Sep  5 14:49:13 2009
New Revision: 811658

URL: http://svn.apache.org/viewvc?rev=811658&view=rev
Log:
SHINDIG-1166 by Matthieu Huguet: Regexp problem during os-data parsing 
(concatinated multiple script tags)

Modified:
    incubator/shindig/trunk/php/src/gadgets/render/GadgetBaseRenderer.php

Modified: incubator/shindig/trunk/php/src/gadgets/render/GadgetBaseRenderer.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/render/GadgetBaseRenderer.php?rev=811658&r1=811657&r2=811658&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/render/GadgetBaseRenderer.php 
(original)
+++ incubator/shindig/trunk/php/src/gadgets/render/GadgetBaseRenderer.php Sat 
Sep  5 14:49:13 2009
@@ -89,7 +89,7 @@
     $osDataRequests = array();
     // First extract all the os-data tags, and execute those in a single 
combined request, saves latency
     // and is consistent with other server implementations
-    
preg_match_all('/(<script.*type="text\/(os-data)".*>)(.*)(<\/script>)/imsxU', 
$content, $osDataRequests);
+    
preg_match_all('/(<script[^>]*type="text\/(os-data)"[^>]*>)(.*)(<\/script>)/imsxU',
 $content, $osDataRequests);
     $osDataRequestsCombined = '';
     foreach ($osDataRequests[0] as $match) {
       $osDataRequestsCombined .= $match . "\n";