Fix URL permalink lookup in some cases
This commit is contained in:
parent
b91764fca1
commit
487f8beae0
@ -3,6 +3,8 @@
|
||||
Version 1.2 ()
|
||||
------------------------------------------------------------------------
|
||||
|
||||
* Fix URL permalink lookup in some cases (garvinhicking, beta2)
|
||||
|
||||
* Add admin backend templates for main area and the entry editor.
|
||||
Falls back to default PHP output if Smarty cannot be utilized.
|
||||
(garvinhicking)
|
||||
|
@ -241,7 +241,7 @@ if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range
|
||||
preg_match(PAT_PERMALINK, $uri, $matches) ) {
|
||||
$serendipity['view'] = 'entry';
|
||||
|
||||
$matches[1] = serendipity_searchPermalink($serendipity['permalinkStructure'], $uri, $matches[1], 'entry');
|
||||
$matches[1] = serendipity_searchPermalink($serendipity['permalinkStructure'], $uri, (!empty($matches[2]) ? $matches[2] : $matches[1]), 'entry');
|
||||
serendipity_rememberComment();
|
||||
|
||||
if (!empty($serendipity['POST']['submit']) && !isset($_REQUEST['serendipity']['csuccess'])) {
|
||||
|
@ -42,7 +42,7 @@ if (defined('USE_MEMSNAP')) {
|
||||
}
|
||||
|
||||
// The version string
|
||||
$serendipity['version'] = '1.2-beta1';
|
||||
$serendipity['version'] = '1.2-beta2';
|
||||
|
||||
// Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
|
||||
$serendipity['production'] = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);
|
||||
|
Loading…
x
Reference in New Issue
Block a user