Author: lindner
Date: Tue Mar 23 07:11:24 2010
New Revision: 926482
URL: http://svn.apache.org/viewvc?rev=926482&view=rev
Log:
SHINIDG-980 | Patch from Jakub Vrana | Meaningless regular expression in
ContainerConfig
Modified:
shindig/trunk/php/src/gadgets/ContainerConfig.php
Modified: shindig/trunk/php/src/gadgets/ContainerConfig.php
URL:
http://svn.apache.org/viewvc/shindig/trunk/php/src/gadgets/ContainerConfig.php?rev=926482&r1=926481&r2=926482&view=diff
==============================================================================
--- shindig/trunk/php/src/gadgets/ContainerConfig.php (original)
+++ shindig/trunk/php/src/gadgets/ContainerConfig.php Tue Mar 23 07:11:24 2010
@@ -68,7 +68,7 @@ class ContainerConfig {
$str = preg_replace('@/\\*.*?\\*/@s', '', $str);
// remove // style comments, but keep 'http://' 'https://' and '"//'
// for example: "gadgets.oauthGadgetCallbackTemplate" :
"//%host%/gadgets/oauthcallback"
- $str = preg_replace('/[^http:\/\/|^https:\/\/|"\/\/]\/\/.*$/m', '', $str);
+ $str = preg_replace('/(?<!http:|https:)\/\/.*$/m', '', $str);
return $str;
}