Conflicts:
	templates/page.html
This commit is contained in:
czaks 2013-06-21 16:41:39 -04:00
commit 24a520485d
13 changed files with 126 additions and 55 deletions

View file

@ -105,7 +105,7 @@ $new_pages = array();
foreach ($pages as $key => $callback) {
if (preg_match('/^secure /', $callback))
$key .= '(/(?P<token>[a-f0-9]{8}))?';
$new_pages[@$key[0] == '!' ? $key : "!^$key$!"] = $callback;
$new_pages[@$key[0] == '!' ? $key : '!^' . $key . '(?:&[^&=]+=[^&]*)*$!'] = $callback;
}
$pages = $new_pages;