You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ch...@apache.org on 2009/09/01 13:03:49 UTC
svn commit: r809970 -
/incubator/shindig/trunk/php/src/gadgets/render/GadgetBaseRenderer.php
Author: chabotc
Date: Tue Sep 1 11:03:48 2009
New Revision: 809970
URL: http://svn.apache.org/viewvc?rev=809970&view=rev
Log:
SHINDIG-1158 by Matthieu Huguet, fixes the regex for seperating out templates, sometimes it was matching multiple <script> blocks together
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=809970&r1=809969&r2=809970&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/render/GadgetBaseRenderer.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/render/GadgetBaseRenderer.php Tue Sep 1 11:03:48 2009
@@ -99,7 +99,7 @@
if (! empty($osDataRequestsCombined)) {
$this->performDataRequests($osDataRequestsCombined);
}
- preg_match_all('/(<script.*type="text\/(os-template)".*>)(.*)(<\/script>)/imxsU', $content, $osTemplates);
+ preg_match_all('/(<script[^>]*type="text\/(os-template)"[^>]*>)(.*)(<\/script>)/imxsU', $content, $osTemplates);
$templateLibrary = false;
if (count($osTemplates[0])) {
// only load the template parser if there's any templates in the gadget content