update non-layout.class.php uses of html_headers too

This commit is contained in:
Shish 2016-06-18 12:49:46 +01:00
parent b76ee95c76
commit cfc1268354
3 changed files with 4 additions and 6 deletions

View file

@ -3,9 +3,8 @@
class HomeTheme extends Themelet { class HomeTheme extends Themelet {
public function display_page(Page $page, $sitename, $base_href, $theme_name, $body) { public function display_page(Page $page, $sitename, $base_href, $theme_name, $body) {
$page->set_mode("data"); $page->set_mode("data");
$hh = "";
$page->add_auto_html_headers(); $page->add_auto_html_headers();
foreach($page->html_headers as $h) {$hh .= $h;} $hh = $page->get_all_html_headers();
$page->set_data(<<<EOD $page->set_data(<<<EOD
<html> <html>
<head> <head>

View file

@ -6,7 +6,7 @@ class SiteDescriptionTest extends ShimmiePHPUnitTestCase {
$this->get_page("post/list"); $this->get_page("post/list");
$this->assertContains( $this->assertContains(
'<meta name="description" content="A Shimmie testbed">', '<meta name="description" content="A Shimmie testbed">',
$page->html_headers $page->get_all_html_headers()
); );
} }
@ -16,7 +16,7 @@ class SiteDescriptionTest extends ShimmiePHPUnitTestCase {
$this->get_page("post/list"); $this->get_page("post/list");
$this->assertContains( $this->assertContains(
'<meta name="keywords" content="foo,bar,baz">', '<meta name="keywords" content="foo,bar,baz">',
$page->html_headers $page->get_all_html_headers()
); );
} }
} }

View file

@ -3,9 +3,8 @@
class CustomHomeTheme extends HomeTheme { class CustomHomeTheme extends HomeTheme {
public function display_page(Page $page, $sitename, $base_href, $theme_name, $body) { public function display_page(Page $page, $sitename, $base_href, $theme_name, $body) {
$page->set_mode("data"); $page->set_mode("data");
$hh = "";
$page->add_auto_html_headers(); $page->add_auto_html_headers();
foreach($page->html_headers as $h) {$hh .= $h;} $hh = $page->get_all_html_headers();
$page->set_data(<<<EOD $page->set_data(<<<EOD
<html> <html>
<head> <head>