Merge pull request #115 from Macil/miscfixes

Miscellaneous fixes
This commit is contained in:
Michael 2013-06-18 10:45:13 -07:00
commit 0ac9dd5f25
8 changed files with 31 additions and 26 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;