From: <hn...@us...> - 2015-05-27 09:29:41
|
Author: hnategh Date: Wed May 27 11:29:33 2015 New Revision: 52841 URL: http://svn.stylite.de/viewvc/egroupware?rev=52841&view=rev Log: Do not remove cd=yes from url of an ajax app which has ajax=true Modified: branches/14.2/jdots/ (props changed) branches/14.2/jdots/inc/class.jdots_framework.inc.php Propchange: branches/14.2/jdots/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 27 11:29:33 2015 @@ -1,3 +1,3 @@ /branches/Stylite-EPL-10.1/jdots:50319 /branches/Stylite-EPL-11.1/jdots:2411-50517 -/trunk/jdots:51437,51453-51454,51508,51538,51588-51589,51612,51649-51650,51715,52014,52099,52113,52131,52141,52143,52145,52181,52190,52200,52234,52267,52299 +/trunk/jdots:51437,51453-51454,51508,51538,51588-51589,51612,51649-51650,51715,52014,52099,52113,52131,52141,52143,52145,52181,52190,52200,52234,52267,52299,52828-52829 Modified: branches/14.2/jdots/inc/class.jdots_framework.inc.php URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/jdots/inc/class.jdots_framework.inc.php?rev=52841&r1=52840&r2=52841&view=diff ============================================================================== --- branches/14.2/jdots/inc/class.jdots_framework.inc.php (original) +++ branches/14.2/jdots/inc/class.jdots_framework.inc.php Wed May 27 11:29:33 2015 @@ -957,7 +957,8 @@ //self::app_from_url might return an application the user has no rights //for or may return an application that simply does not exist. So check first //whether the $active_tab really exists in the $apps array. - if ($active_tab && array_key_exists($active_tab, $apps)) + // Do not remove cd=yes if it's an ajax=true app + if ($active_tab && array_key_exists($active_tab, $apps) && strpos( $apps[$active_tab]['url'],'ajax=true') === False) { $apps[$active_tab]['openOnce'] = preg_replace('/[&?]cd=yes/','',$url); $store_prefs = true; |