From 782deb84f116577770e346db2e1da4de76e4db40 Mon Sep 17 00:00:00 2001 From: nathangray Date: Wed, 24 Jan 2018 10:28:34 -0700 Subject: [PATCH] Fix wiki links did not load properly after login if your session was expired --- api/src/Framework/Ajax.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/src/Framework/Ajax.php b/api/src/Framework/Ajax.php index e4d1a3abc9..96f83fd913 100755 --- a/api/src/Framework/Ajax.php +++ b/api/src/Framework/Ajax.php @@ -552,7 +552,7 @@ abstract class Ajax extends Api\Framework $link = preg_replace("/^(javascript:egw_link_handler\(')(.*)menuaction=([^&]+)(.*)(','[^']+'\))$/", '$1$2menuaction=admin.admin_ui.index&load=$3$4&ajax=' . ($ajax[1] ? $ajax[1] : 'true') .'\',\'admin\')', $file_was=$link); } - + } $this->sideboxes[$appname][$menu_title] = $file; @@ -865,8 +865,8 @@ abstract class Ajax extends Api\Framework else if (strpos($url, 'menuaction') > 0) { // Coming in with a specific URL, save it and redirect to index.php - // so reloads work nicely - $last_direct_url = $url; + // so reloads work nicely, but strip cd=yes or we'll get the framework again + $last_direct_url = preg_replace('/[&?]cd=yes/','',$url); Api\Framework::redirect_link('/index.php?cd=yes'); } else