From: <var...@us...> - 2021-08-06 10:34:35
|
Revision: 10450 http://sourceforge.net/p/phpwiki/code/10450 Author: vargenau Date: 2021-08-06 10:34:32 +0000 (Fri, 06 Aug 2021) Log Message: ----------- Remove "abs_path" Modified Paths: -------------- trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/WikiAdminUtils.php Modified: trunk/lib/plugin/RedirectTo.php =================================================================== --- trunk/lib/plugin/RedirectTo.php 2021-08-06 10:24:32 UTC (rev 10449) +++ trunk/lib/plugin/RedirectTo.php 2021-08-06 10:34:32 UTC (rev 10450) @@ -80,9 +80,7 @@ return $this->disabled(_("Redirect to an external URL is only allowed in locked pages.")); } } elseif ($page) { - $url = WikiURL($page, - array('redirectfrom' => $request->getArg('pagename')), - 'abs_path'); + $url = WikiURL($page, array('redirectfrom' => $request->getArg('pagename'))); } else { return $this->error(_("'href' or 'page' parameter missing.")); } @@ -97,9 +95,9 @@ $redirectfrom = $request->getArg('redirectfrom'); if ($redirectfrom !== false) { - if ($redirectfrom) + if ($redirectfrom) { return $this->disabled(_("Double redirect not allowed.")); - else { + } else { // Got here by following the "Redirected from ..." link // on a browse page. return $this->disabled(_("Viewing redirecting page.")); Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2021-08-06 10:24:32 UTC (rev 10449) +++ trunk/lib/plugin/WikiAdminUtils.php 2021-08-06 10:34:32 UTC (rev 10450) @@ -112,9 +112,7 @@ if (strpos($return_url, '?')) { $return_url = substr($return_url, 0, strpos($return_url, '?')); } - $url = WikiURL($return_url, - array('warningmsg' => $message), - 'abs_path'); + $url = WikiURL($return_url, array('warningmsg' => $message)); return $request->redirect($url); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |