More fixes for fetchUserData(), missing template added

diff --git a/.gitattributes b/.gitattributes
index ca82c559f5c73cdfe7e976e323503942a74c9e20..fdbcdc6c979fe9753eb4b5d5734c8dee09915490 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1549,6 +1549,7 @@ templates/de/html/menu/menu_member_advert_account.tpl -text
 templates/de/html/menu/menu_member_advert_bank.tpl -text
 templates/de/html/menu/menu_member_advert_end.tpl -text
 templates/de/html/menu/menu_member_advert_extras.tpl -text
+templates/de/html/menu/menu_member_advert_logout.tpl -text
 templates/de/html/menu/menu_member_advert_main.tpl -text
 templates/de/html/menu/menu_member_advert_order.tpl -text
 templates/de/html/menu/menu_member_advert_rals.tpl -text

diff --git a/inc/functions.php b/inc/functions.php
index 90e2bc50580fd7d076333d0cd2834421576a32d5..7908206a7c6e5af7b92335a8f34e52c5faad74a0 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -3672,7 +3672,7 @@ function isTemplateCached ($template) {
 // Flushes non-flushed template cache to disk
 function flushTemplateCache ($template, $eval) {
        // Is this cache flushed?
-       if (!isTemplateCached($template)) {
+       if ((!isTemplateCached($template)) && ($eval != '404')) {
                // Generate FQFN
                $FQFN = sprintf("%s_compiled/templates/%s.tpl.cache", getConfig('CACHE_PATH'), $template);
 

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 343477e89101ab298cd11456a0754c92bd1132ec..e1f912c95f6c9bf33c12dba11e2e974c75dfcd02 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -583,6 +583,9 @@ function isMember () {
        } elseif (getUserId() == 0) {
                // No member
                return false;
+       } else {
+               // Transfer userid=>current
+               setCurrentUserid(getUserId());
        }
 
        // Init global user data array
@@ -635,7 +638,7 @@ function fetchUserData ($userid, $column='userid') {
        if ($userid < 1) {
                // Invalid, so abort here
                debug_report_bug('User id ' . $userid . ' is invalid.');
-       } elseif (isset($GLOBALS['user_data'][$userid])) {
+       } elseif (isUserDataValid()) {
                // Use cache, so it is fine
                return true;
        }

diff --git a/templates/de/html/menu/menu_member_advert_logout.tpl b/templates/de/html/menu/menu_member_advert_logout.tpl
new file mode 100644 (file)
index 0000000..7014e93
--- /dev/null
+++ b/templates/de/html/menu/menu_member_advert_logout.tpl
@@ -0,0 +1,6 @@
+<tr>
+       <td class="menu_advert">
+               <a href="{?URL?}/modules.php?module=index&amp;what=impressum" target="_blank">Hier k&ouml;nnte Ihre Werbung stehen!</a>
+               <!-- Fuegen Sie hier Ihre Werbung ein! //-->
+       </td>
+</tr>