mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 14:17:49 +02:00
Code Issues Releases Wiki Activity

Meta-Tags: Issue #2544 - avoid duplication.

Browse Source
This commit is contained in:
Cameron
2017-03-31 15:49:33 -07:00
parent 3758d55e1c
commit 80fbb2a334
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
e107_core/templates/header_default.php
View File

@@ -168,10 +168,6 @@ echo e107::getUrl()->response()->renderMeta()."\n"; // render all the e107::meta
echo "<title>".(defined('e_PAGETITLE') ? e_PAGETITLE.' - ' : (defined('PAGE_NAME') ? PAGE_NAME.' - ' : "")).SITENAME."</title>\n\n";
//
// D: Register CSS
//
@@ -465,7 +461,7 @@ if(function_exists('theme_head'))
echo theme_head();
}
// FIXME description and keywords meta tags shouldn't be sent on all pages
/* @deprecated */
$diz_merge = (defined("META_MERGE") && META_MERGE != FALSE && $pref['meta_description'][e_LANGUAGE]) ? $pref['meta_description'][e_LANGUAGE]." " : "";
$key_merge = (defined("META_MERGE") && META_MERGE != FALSE && $pref['meta_keywords'][e_LANGUAGE]) ? $pref['meta_keywords'][e_LANGUAGE]."," : "";
@@ -493,9 +489,15 @@ function render_meta($type)
}
}
echo (defined("META_DESCRIPTION")) ? "\n<meta name=\"description\" content=\"".$diz_merge.META_DESCRIPTION."\" />\n" : render_meta('description');
echo (defined("META_KEYWORDS")) ? "\n<meta name=\"keywords\" content=\"".$key_merge.META_KEYWORDS."\" />\n" : render_meta('keywords');
// legay meta-tag checks.
if(empty(e107::getUrl()->response()->getMetaKeywords()))
{
echo (defined("META_KEYWORDS")) ? "\n<meta name=\"keywords\" content=\"".$key_merge.META_KEYWORDS."\" />\n" : render_meta('keywords');
}
if(empty(e107::getUrl()->response()->getMetaDescription()))
{
echo (defined("META_DESCRIPTION")) ? "\n<meta name=\"description\" content=\"".$diz_merge.META_DESCRIPTION."\" />\n" : render_meta('description');
}
//echo render_meta('copyright');
//echo render_meta('author');

1
e107_plugins/download/handlers/download_class.php
View File

@@ -415,6 +415,7 @@ class download
$sc->setVars($dlrow);
$this->setMeta($dlrow);
if(!isset($DL_VIEW_PAGETITLE))
{
$DL_VIEW_PAGETITLE = "{DOWNLOAD_VIEW_NAME} / {DOWNLOAD_CATEGORY} / ".LAN_PLUGIN_DOWNLOAD_NAME;