reset conntent_message for staticpage plugin

This commit is contained in:
Garvin Hicking 2017-01-02 09:52:31 +01:00
parent a927e3d78b
commit 214c00c577
2 changed files with 5 additions and 1 deletions

View file

@ -1,3 +1,5 @@
4.15: Override content message when 404 view is taken over by this plugin
4.14: Iconfont a11y fix (yellowled)
4.13: IE11 backend flexbox fix (yellowled)

View file

@ -91,7 +91,7 @@ class serendipity_event_staticpage extends serendipity_event
$propbag->add('page_configuration', $this->config);
$propbag->add('type_configuration', $this->config_types);
$propbag->add('author', 'Marco Rinck, Garvin Hicking, David Rolston, Falk Doering, Stephan Manske, Pascal Uhlmann, Ian, Don Chambers');
$propbag->add('version', '4.14');
$propbag->add('version', '4.15');
$propbag->add('requirements', array(
'serendipity' => '2.0',
'smarty' => '2.6.7',
@ -1135,6 +1135,8 @@ class serendipity_event_staticpage extends serendipity_event
function parseStaticPage($pagevar = 'staticpage_', $template = 'plugin_staticpage.tpl') { /* No more & */
global $serendipity;
$serendipity['content_message'] = ''; // Reset message for 404 error handling which is now overriden
$filename = $this->get_static('filename');
if (empty($filename) || $filename == 'none.html') {
$filename = $template;