merged pull #15

This commit is contained in:
Garvin Hicking 2013-04-29 13:34:36 +02:00
parent f6295a2e4a
commit f31800fad9
3 changed files with 7 additions and 0 deletions

View File

@ -3,6 +3,8 @@
Version 2.0 ()
------------------------------------------------------------------------
* Implemented patch https://github.com/s9y/Serendipity/pull/15
* When switching templates, both the backend and the frontend
will remember the timestamp of the last template change,
to make sure that the browser will not cache a mismatching CSS.

View File

@ -115,6 +115,8 @@ if ($serendipity['smarty_raw_mode']) {
// Show the archive
case 'archives':
$serendipity['head_subtitle'] = ARCHIVES;
$serendipity['smarty']->assign('head_subtitle', $serendipity['head_subtitle']);
serendipity_printArchives();
break;

View File

@ -459,6 +459,9 @@ if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range
header('Status: 404 Not found');
} else {
$serendipity['head_title'] = $cInfo['category_name'];
if (isset($serendipity['GET']['page'])) {
$serendipity['head_title'] .= " - " . htmlspecialchars($serendipity['GET']['page']);
}
$serendipity['head_subtitle'] = $serendipity['blogTitle'];
}