From 12cdbf7df4b4c3d080bcb04ea1308842dc4ab421 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 12 May 2010 19:18:28 +0000 Subject: [PATCH] "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" --- etemplate/inc/class.etemplate.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php index 8f0e98e797..07c59dee45 100644 --- a/etemplate/inc/class.etemplate.inc.php +++ b/etemplate/inc/class.etemplate.inc.php @@ -2004,7 +2004,7 @@ class etemplate extends boetemplate } // 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); }