X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=bf3b16b973dd738593a02176c010254269a115e7;hp=c9c73e5718505fb6c716136322221c4c54f7b48f;hb=d0c133d3ee415498b9b69237f2806ac15b04ae18;hpb=1e1188491367caefea828ed0dca143c7115c02c5
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index c9c73e5718..bf3b16b973 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -289,7 +289,7 @@ function checkModulePermissions ($mod = '') {
}
// Add menu description pending on given file name (without path!)
-function addMenuDescription ($accessLevel, $FQFN, $return = false, $output = true) {
+function addMenuDescription ($accessLevel, $FQFN, $return = false) {
// Use only filename of the FQFN...
$file = basename($FQFN);
@@ -354,14 +354,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false, $output = tru
$search = substr($search, 0, -4);
} // END - i
- // Get the title from menu
- $ret = getTitleFromMenu($accessLevel, $search, $type, $AND);
-
- // Shall we return it?
- if ($return === true) {
- // Return title
- return $ret;
- } elseif (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (getConfig('youre_here') == 'Y')) || ((isAdmin()) && ($modCheck == 'admin'))) {
+ if (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (getConfig('youre_here') == 'Y')) || ((isAdmin()) && ($modCheck == 'admin'))) {
// Output HTML code
$OUT = $prefix . "" . $ret . "\n";
@@ -374,18 +367,20 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false, $output = tru
$GLOBALS['nav_depth'] = '0';
// Run the filter chain
- $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ""));
+ $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ''));
+
+ // Add additional content
$OUT .= $ret['content'];
} // END - if
}
// Return or output HTML code?
- if ($output === true) {
- // Output HTML code here
- outputHtml($OUT);
- } else {
+ if ($return === true) {
// Return HTML code
return $OUT;
+ } else {
+ // Output HTML code here
+ outputHtml($OUT);
}
}
@@ -1653,7 +1648,7 @@ function generateMetaDescriptionCode ($mod, $what) {
// Exclude admin and member's area
if (($mod != 'admin') && ($mod != 'login')) {
// Construct dynamic description
- $DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . addMenuDescription('guest', 'what-'.$what, true);
+ $DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . getTitleFromMenu('guest', $what);
// Output it directly
outputHtml('');