Fixes for bugs when ext-imprint is registered. Resolves #153

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index 571721e63df27a0ce329c36a866abd22d4fc49b7..4c23235ac20812d568c89b9d06066dcd36354f5e 100644 (file)
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -176,6 +176,9 @@ class CacheSystem {
                                        } else {
                                                $GLOBALS['cache_array']['themes'][$k][$data['theme_path']] = $v;
                                        }
+                               } elseif ($this->name == 'imprint') {
+                                       // Imprint
+                                       $GLOBALS['cache_array']['imprint'][$k][$data['imprint_id']] = $v;
                                } else {
                                        // Finialize the cache and close it
                                        $this->finalize();

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index c9f97c7b212f8f057c1dc78425d2b18761572cb5..ca8ef7430bea5c8278e7db68de63e6ad31a72ff2 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -675,7 +675,17 @@ function setUsername ($userName) {
 
 // Get username
 function getUsername () {
-       return $GLOBALS['username'];
+       // default is guest
+       $username = getMessage('USERNAME_GUEST');
+
+       // User name set?
+       if (isset($GLOBALS['username'])) {
+               // Use the set name
+               $username = $GLOBALS['username'];
+       } // END - if
+
+       // Return it
+       return $username;
 }
 
 // Wrapper function for installation phase