mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

Admin-nav and frontend keyword/meta error. PHP5.4

Browse Source
This commit is contained in:
Cameron
2017-04-02 12:09:57 -07:00
parent 6bde567964
commit f3f7826c95
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_core/templates/header_default.php
View File

@@ -490,11 +490,13 @@ function render_meta($type)
} }
// legay meta-tag checks. // legay meta-tag checks.
if(empty(e107::getUrl()->response()->getMetaKeywords())) $isKeywords = e107::getUrl()->response()->getMetaKeywords();
$isDescription = e107::getUrl()->response()->getMetaDescription();
if(empty($isKeywords))
{ {
echo (defined("META_KEYWORDS")) ? "\n<meta name=\"keywords\" content=\"".$key_merge.META_KEYWORDS."\" />\n" : render_meta('keywords'); echo (defined("META_KEYWORDS")) ? "\n<meta name=\"keywords\" content=\"".$key_merge.META_KEYWORDS."\" />\n" : render_meta('keywords');
} }
if(empty(e107::getUrl()->response()->getMetaDescription())) if(empty($isDescription))
{ {
echo (defined("META_DESCRIPTION")) ? "\n<meta name=\"description\" content=\"".$diz_merge.META_DESCRIPTION."\" />\n" : render_meta('description'); echo (defined("META_DESCRIPTION")) ? "\n<meta name=\"description\" content=\"".$diz_merge.META_DESCRIPTION."\" />\n" : render_meta('description');
} }
@@ -503,7 +505,7 @@ if(empty(e107::getUrl()->response()->getMetaDescription()))
//echo render_meta('author'); //echo render_meta('author');
echo render_meta('tag'); echo render_meta('tag');
unset($key_merge,$diz_merge); unset($key_merge,$diz_merge,$isKeywords,$isDescription);
// ---------- Favicon --------- // ---------- Favicon ---------
if (file_exists(THEME."favicon.ico")) if (file_exists(THEME."favicon.ico"))

2
e107_themes/bootstrap3/admin_template.php
View File

@@ -27,7 +27,7 @@ $E_ADMIN_NAVIGATION['start_other'] = '<ul class="nav nav-admin navbar-nav navbar
$E_ADMIN_NAVIGATION['button'] = ' $E_ADMIN_NAVIGATION['button'] = '
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_TEXT}"> <a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_TEXT}">
{LINK_IMAGE} {LINK_IMAGE} <span class="hidden-md hidden-lg">{LINK_TEXT}</span>
<b class="caret"></b> <b class="caret"></b>
</a> </a>
{SUB_MENU} {SUB_MENU}