james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #556 from shish/html-headers

Browse Source 
fix and use get_all_html_headers()
This commit is contained in:
Shish 2016-06-18 14:05:44 +01:00 committed by GitHub
commit 20d0edb332
11 changed files with 14 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/page.class.php
View File

@ -225,8 +225,9 @@ class Page {
*/
public function get_all_html_headers() {
$data = '';
ksort($this->html_headers);
foreach ($this->html_headers as $line) {
$data .= $line . "\n";
$data .= "\t\t" . $line . "\n";
}
return $data;
}

3
ext/home/theme.php
View File

@ -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(<<<EOD
<html>
<head>

4
ext/site_description/test.php
View File

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

8
themes/danbooru/layout.class.php
View File

@ -50,13 +50,7 @@ class Layout {
//$base_href = $config->get_string('base_href');
$data_href = get_base_href();
$contact_link = contact_link();
$header_html = "";
ksort($page->html_headers);
foreach($page->html_headers as $line) {
$header_html .= "\t\t$line\n";
}
$header_html = $page->get_all_html_headers();
$left_block_html = "";
$user_block_html = "";

8
themes/danbooru2/layout.class.php
View File

@ -50,13 +50,7 @@ class Layout {
//$base_href = $config->get_string('base_href');
//$data_href = get_base_href();
$contact_link = contact_link();
$header_html = "";
ksort($page->html_headers);
foreach($page->html_headers as $line) {
$header_html .= "\t\t$line\n";
}
$header_html = $page->get_all_html_headers();
$left_block_html = "";
$user_block_html = "";

7
themes/default/layout.class.php
View File

@ -14,12 +14,7 @@ class Layout {
//$theme_name = $config->get_string('theme', 'default');
//$data_href = get_base_href();
$contact_link = contact_link();
$header_html = "";
ksort($page->html_headers);
foreach($page->html_headers as $line) {
$header_html .= "\t\t$line\n";
}
$header_html = $page->get_all_html_headers();
$left_block_html = "";
$main_block_html = "";

7
themes/futaba/layout.class.php
View File

@ -7,12 +7,7 @@ class Layout {
$theme_name = $config->get_string('theme', 'default');
$data_href = get_base_href();
$contact_link = contact_link();
$header_html = "";
ksort($page->html_headers);
foreach($page->html_headers as $line) {
$header_html .= "\t\t$line\n";
}
$header_html = $page->get_all_html_headers();
$left_block_html = "";
$main_block_html = "";

7
themes/lite/layout.class.php
View File

@ -21,12 +21,7 @@ class Layout {
$site_name = $config->get_string('title');
$data_href = get_base_href();
$contact_link = contact_link();
$header_html = "";
ksort($page->html_headers);
foreach($page->html_headers as $line) {
$header_html .= "\t\t{$line}\n";
}
$header_html = $page->get_all_html_headers();
$menu = "<div class='menu'>
<script type='text/javascript' src='{$data_href}/themes/{$theme_name}/wz_tooltip.js'></script>

3
themes/material/home.theme.php
View File

@ -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(<<<EOD
<html>
<head>

9
themes/material/layout.class.php
View File

@ -14,13 +14,8 @@ class Layout {
$data_href = get_base_href();
$main_page = $config->get_string('main_page');
$contact_link = contact_link();
$site_link = make_link();
$header_html = "";
ksort($page->html_headers);
foreach($page->html_headers as $line) {
$header_html .= "\t\t$line\n";
}
$site_link = make_link();
$header_html = $page->get_all_html_headers();
$left_block_html = "";
$main_block_html = "";

7
themes/warm/layout.class.php
View File

@ -16,12 +16,7 @@ class Layout {
$data_href = get_base_href();
$main_page = $config->get_string('main_page');
$contact_link = contact_link();
$header_html = "";
ksort($page->html_headers);
foreach($page->html_headers as $line) {
$header_html .= "\t\t$line\n";
}
$header_html = $page->get_all_html_headers();
$left_block_html = "";
$main_block_html = "";