mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

When any URL is going to be used in a Location header or

Browse Source 
in a meta-refresh, both Safari and Firefox, seems to fail
using & as parameter separator. Bug 2620.
(http://moodle.org/bugs/bug.php?op=show&bugid=2620)
This commit is contained in:
stronk7 2005-02-22 23:37:14 +00:00
parent fd05dffed6
commit 029db9ee2d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/wiki/ewiki/ewiki.php
View File

@ -802,6 +802,7 @@ function ewiki_script($asid="", $id=false, $params="", $bin=0, $html=1, $script=
$script = &$ewiki_config[!$bin?"script":"script_binary"];
}
#-- separate $action and $id for old style requests
if ($id === false) {
if (strpos($asid, EWIKI_ACTION_SEP_CHAR) !== false) {
@ -860,7 +861,11 @@ function ewiki_script($asid="", $id=false, $params="", $bin=0, $html=1, $script=
#-- fin
if ($html) {
//Don't replace & if it's part of encoded character (bug 2209)
$url = preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,5};)/","&", $url);
} else {
//This is going to be used in some header or meta redirect, so It cannot use & (bug 2620)
$url = preg_replace('/&/', '&', $url);
}
return($url);
}
@ -1447,6 +1452,7 @@ function ewiki_page_edit($id, $data, $action) {
if (EWIKI_EDIT_REDIRECT) {
$url = ewiki_script("", $id, "thankyou=1", 0, 0, EWIKI_HTTP_HEADERS?ewiki_script_url():0);
if (EWIKI_HTTP_HEADERS && !headers_sent()) {
header("Status: 303 Redirect for GET");
header("Location: $url");
@ -2259,6 +2265,7 @@ function ewiki_link_regex_callback($uu, $force_noimg=0) {
if (strpos("://", $title) || strpos($title, ":") && !strpos($href, ":")) {
$uu = $title; $title = $href; $href = $uu;
}
#-- new entitling scheme [ url "title" ]
if ((($l=strpos($str, '"')) < ($r=strrpos($str, '"'))) && ($l!==false) ) {
$title = substr($str, $l + 1, $r - $l - 1);
@ -2292,7 +2299,6 @@ function ewiki_link_regex_callback($uu, $force_noimg=0) {
$href = $ewiki_id;
}
#-- for case-insensitivines
$href_i = EWIKI_CASE_INSENSITIVE ? strtolower($href) : ($href);