From cfc126835482f1092317fbdbb796a441247f0c97 Mon Sep 17 00:00:00 2001 From: Shish Date: Sat, 18 Jun 2016 12:49:46 +0100 Subject: [PATCH] update non-layout.class.php uses of html_headers too --- ext/home/theme.php | 3 +-- ext/site_description/test.php | 4 ++-- themes/material/home.theme.php | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ext/home/theme.php b/ext/home/theme.php index 6c51c73d..7c829d29 100644 --- a/ext/home/theme.php +++ b/ext/home/theme.php @@ -3,9 +3,8 @@ class HomeTheme extends Themelet { public function display_page(Page $page, $sitename, $base_href, $theme_name, $body) { $page->set_mode("data"); - $hh = ""; $page->add_auto_html_headers(); - foreach($page->html_headers as $h) {$hh .= $h;} + $hh = $page->get_all_html_headers(); $page->set_data(<< diff --git a/ext/site_description/test.php b/ext/site_description/test.php index 0ebd3d68..073252be 100644 --- a/ext/site_description/test.php +++ b/ext/site_description/test.php @@ -6,7 +6,7 @@ class SiteDescriptionTest extends ShimmiePHPUnitTestCase { $this->get_page("post/list"); $this->assertContains( '', - $page->html_headers + $page->get_all_html_headers() ); } @@ -16,7 +16,7 @@ class SiteDescriptionTest extends ShimmiePHPUnitTestCase { $this->get_page("post/list"); $this->assertContains( '', - $page->html_headers + $page->get_all_html_headers() ); } } diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php index a0cdf0eb..b8d050b8 100644 --- a/themes/material/home.theme.php +++ b/themes/material/home.theme.php @@ -3,9 +3,8 @@ class CustomHomeTheme extends HomeTheme { public function display_page(Page $page, $sitename, $base_href, $theme_name, $body) { $page->set_mode("data"); - $hh = ""; $page->add_auto_html_headers(); - foreach($page->html_headers as $h) {$hh .= $h;} + $hh = $page->get_all_html_headers(); $page->set_data(<<