merged pull #15
This commit is contained in:
parent
f6295a2e4a
commit
f31800fad9
@ -3,6 +3,8 @@
|
|||||||
Version 2.0 ()
|
Version 2.0 ()
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
|
|
||||||
|
* Implemented patch https://github.com/s9y/Serendipity/pull/15
|
||||||
|
|
||||||
* When switching templates, both the backend and the frontend
|
* When switching templates, both the backend and the frontend
|
||||||
will remember the timestamp of the last template change,
|
will remember the timestamp of the last template change,
|
||||||
to make sure that the browser will not cache a mismatching CSS.
|
to make sure that the browser will not cache a mismatching CSS.
|
||||||
|
@ -115,6 +115,8 @@ if ($serendipity['smarty_raw_mode']) {
|
|||||||
|
|
||||||
// Show the archive
|
// Show the archive
|
||||||
case 'archives':
|
case 'archives':
|
||||||
|
$serendipity['head_subtitle'] = ARCHIVES;
|
||||||
|
$serendipity['smarty']->assign('head_subtitle', $serendipity['head_subtitle']);
|
||||||
serendipity_printArchives();
|
serendipity_printArchives();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -459,6 +459,9 @@ if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range
|
|||||||
header('Status: 404 Not found');
|
header('Status: 404 Not found');
|
||||||
} else {
|
} else {
|
||||||
$serendipity['head_title'] = $cInfo['category_name'];
|
$serendipity['head_title'] = $cInfo['category_name'];
|
||||||
|
if (isset($serendipity['GET']['page'])) {
|
||||||
|
$serendipity['head_title'] .= " - " . htmlspecialchars($serendipity['GET']['page']);
|
||||||
|
}
|
||||||
$serendipity['head_subtitle'] = $serendipity['blogTitle'];
|
$serendipity['head_subtitle'] = $serendipity['blogTitle'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user