Note to self 2: Do as you preach. Test!

diff --git a/lib/base.php b/lib/base.php
index fd31cfd9f292532cbf0bd49dea3233bc184831a4..0650361be91f7d99bfda70e3acd68a8425bef39d 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -570,7 +570,7 @@ class OC {
                        }
                        // NOTE: This will be replaced to use OCP
                        $userSession = \OC_User::getUserSession();
-                       $userSession->listen('postLogin', array('OC\Cache\File', 'loginListener'));
+                       $userSession->listen('postLogin', '\OC\Cache\File', 'loginListener');
                }
        }
 

diff --git a/lib/cache.php b/lib/cache.php
index c99663a0ca5b159d231d49b5903658b5c0607c23..a4fa8be710c2c2ec4277215a9d1610857215ae27 100644 (file)
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Cache;
+namespace OC;
 
 class Cache {
        /**
@@ -24,7 +24,7 @@ class Cache {
         */
        static public function getGlobalCache() {
                if (!self::$global_cache) {
-                       self::$global_cache = new FileGlobal();
+                       self::$global_cache = new Cache\FileGlobal();
                }
                return self::$global_cache;
        }
@@ -35,7 +35,7 @@ class Cache {
         */
        static public function getUserCache() {
                if (!self::$user_cache) {
-                       self::$user_cache = new File();
+                       self::$user_cache = new Cache\File();
                }
                return self::$user_cache;
        }

diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php
index 9ca17402933ecb4942f779396987b40f6df7f0d3..bd049bba4d0a5ebc2c0bb56bc807cce26fb2e2c4 100644 (file)
--- a/lib/cache/fileglobal.php
+++ b/lib/cache/fileglobal.php
@@ -10,7 +10,7 @@ namespace OC\Cache;
 
 class FileGlobal {
        static protected function getCacheDir() {
-               $cache_dir = get_temp_dir().'/owncloud-'.OC_Util::getInstanceId().'/';
+               $cache_dir = get_temp_dir().'/owncloud-' . \OC_Util::getInstanceId().'/';
                if (!is_dir($cache_dir)) {
                        mkdir($cache_dir);
                }

diff --git a/lib/legacy/cache.php b/lib/legacy/cache.php
index 83b214170f73b162c1c3e8ee27cdc4b5c9f39941..f915eb516b1e538c5db80b91b5fc17f1382426f2 100644 (file)
--- a/lib/legacy/cache.php
+++ b/lib/legacy/cache.php
@@ -6,5 +6,5 @@
  * See the COPYING-README file.
  */
 
-class Cache extends OC\Cache {
+class OC_Cache extends \OC\Cache {
 }
\ No newline at end of file