mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

* Change uriArgument parsing routine to allow "!" in URLs.

Browse Source 
Now we can have absolute serocracy.
This commit is contained in:
Garvin Hicking
2009-05-28 08:34:52 +00:00
parent 876a15980b
commit be0bdd9cf6
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions_permalinks.inc.php
View File

@ -777,7 +777,7 @@ static $indexFile = null;
}
/* Explode the path into sections, to later be able to check for arguments and add our own */
preg_match('/^'. preg_quote($serendipity['serendipityHTTPPath'], '/') . '(' . preg_quote($serendipity['indexFile'], '/') . '\?\/)?(' . ($wildcard ? '.+' : '[;,_a-z0-9\-*\/%\+]+') . ')/i', $uri, $_res);
preg_match('/^'. preg_quote($serendipity['serendipityHTTPPath'], '/') . '(' . preg_quote($serendipity['indexFile'], '/') . '\?\/)?(' . ($wildcard ? '.+' : '[!;,_a-z0-9\-*\/%\+]+') . ')/i', $uri, $_res);
if (strlen($_res[2]) != 0) {
$args = explode('/', $_res[2]);
if ($args[0] == $indexFile || $args[0] == $serendipity['indexFile']) {

3
include/genpage.inc.php
View File

@ -21,7 +21,8 @@ if (!defined('S9Y_FRAMEWORK_PLUGIN_INTERNAL')) {
$uri_addData = array(
'startpage' => false,
'uriargs' => implode('/', serendipity_getUriArguments($uri, true)),
'view' => $serendipity['view']
'view' => $serendipity['view'],
'viewtype' => $serendipity['viewtype']
);
if ((empty($uri_addData['uriargs']) || trim($uri_addData['uriargs']) == $serendipity['indexFile']) && empty($serendipity['GET']['subpage'])) {
$uri_addData['startpage'] = true;