generateMetaDescriptionCode() has now no longer parameters

diff --git a/inc/functions.php b/inc/functions.php
index 62aa009248af7c6c1c1b9d9140043c9aeb2ff6be..b61e863c5c92b49555f5040b6d994438084ab582 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -3947,7 +3947,7 @@ function loadHtmlHeader () {
                // Add meta description to header
                if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
                        // Add meta description not in admin and login module and when the script is installed
                // Add meta description to header
                if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
                        // Add meta description not in admin and login module and when the script is installed

-                       generateMetaDescriptionCode(getModule(), getWhat());
+                       generateMetaDescriptionCode();

                } // END - if
        } // END - if
 
                } // END - if
        } // END - if
 


@@ -3967,6 +3967,21 @@ function addPageHeaderFooter () {
        $GLOBALS['output'] = $GLOBALS['page_header'] . $GLOBALS['output'] . $GLOBALS['page_footer'];
 }
 
        $GLOBALS['output'] = $GLOBALS['page_header'] . $GLOBALS['output'] . $GLOBALS['page_footer'];
 }
 

+// Generates meta description for current module and 'what' value
+function generateMetaDescriptionCode () {
+       // Only include from guest area
+       if (getModule() == 'index') {
+               // Construct dynamic description
+               $DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . getTitleFromMenu('guest', getWhat());
+
+               // Output it directly
+               $GLOBALS['page_header'] .= '<meta name="description" content="' . $DESCR . '" />';
+       } // END - if
+
+       // Remove depth
+       unset($GLOBALS['ref_level']);
+}
+

 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index f6d0955d578bcc4b8714357797cb9d3ed2ec8d48..30aa831a000bf40ea87d550c7444c0dc160917a1 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1673,21 +1673,6 @@ WHERE
        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__);
 }
 
        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__);
 }
 

-// Generates meta description for given module and 'what' value
-function generateMetaDescriptionCode ($module, $what) {
-       // Only include from guest area
-       if ($module == 'index') {
-               // Construct dynamic description
-               $DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . getTitleFromMenu('guest', $what);
-
-               // Output it directly
-               $GLOBALS['page_header'] .= '<meta name="description" content="' . $DESCR . '" />';
-       } // END - if
-
-       // Remove depth
-       unset($GLOBALS['ref_level']);
-}
-

 // Gets the matching what name from module
 function getWhatFromModule ($modCheck) {
        // Is the request element set?
 // Gets the matching what name from module
 function getWhatFromModule ($modCheck) {
        // Is the request element set?