fix and use get_all_html_headers()

This commit is contained in:
Shish 2016-06-18 12:25:54 +01:00
parent f3a3c76988
commit b76ee95c76
8 changed files with 10 additions and 46 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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