"fix for bug #2588 and #2592: links/popups in resources are not working

--> seems to be an aftermath of the new quoting
Thanks to Yudhi Kusnanto for a patch"
This commit is contained in:
Ralf Becker 2010-05-12 19:18:28 +00:00
parent 07db55d3d3
commit 12cdbf7df4

View File

@ -2004,7 +2004,7 @@ class etemplate extends boetemplate
} }
// replace window.open() with EGw's egw_openWindowCentered2() // replace window.open() with EGw's egw_openWindowCentered2()
if (strpos($on,'window.open(') !== false && preg_match("/window.open\('(.*)','(.*)','dependent=yes,width=(.*),height=(.*),scrollbars=yes,status=(.*)'\)/",$on,$matches)) if (strpos($on,'window.open(') !== false && preg_match("/window.open\('(.*)','(.*)','dependent=yes,width=([^,]*),height=([^,]*),scrollbars=yes,status=(.*)'\)/",$on,$matches))
{ {
$on = str_replace($matches[0], "egw_openWindowCentered2('$matches[1]', '$matches[2]', $matches[3], $matches[4], '$matches[5]')", $on); $on = str_replace($matches[0], "egw_openWindowCentered2('$matches[1]', '$matches[2]', $matches[3], $matches[4], '$matches[5]')", $on);
} }