diff options
| author | Owen Winkler <a_github@midnightcircus.com> | 2013-10-01 17:51:33 -0700 |
|---|---|---|
| committer | Owen Winkler <a_github@midnightcircus.com> | 2013-10-01 17:51:33 -0700 |
| commit | 535ed8369f701a184340a428e82cc8d7cc7588bb (patch) | |
| tree | 6b53d3f1b9aabd9d62092f1ad7b2568bd55b5c51 | |
| parent | 5ade595911261cf47cdad17deb4d1a013f523245 (diff) | |
| parent | 9eab8b39df34b507530b0beceb31eb23fbea54f5 (diff) | |
| download | nextcloud-server-535ed8369f701a184340a428e82cc8d7cc7588bb.tar.gz nextcloud-server-535ed8369f701a184340a428e82cc8d7cc7588bb.zip | |
Merge pull request #4894 from owncloud/fixing-4620-master
Fixing broken layout in master due to APC enabled
| -rw-r--r-- | lib/autoloader.php | 6 | ||||
| -rwxr-xr-x | lib/private/util.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/autoloader.php b/lib/autoloader.php index 72041200116..8b12e6bc4b7 100644 --- a/lib/autoloader.php +++ b/lib/autoloader.php @@ -117,7 +117,11 @@ class Autoloader { // Does this PHP have an in-memory cache? We cache the paths there if ($this->constructingMemoryCache && !$this->memoryCache) { $this->constructingMemoryCache = false; - $this->memoryCache = \OC\Memcache\Factory::createLowLatency('Autoloader'); + try { + $this->memoryCache = \OC\Memcache\Factory::createLowLatency('Autoloader'); + } catch(\Exception $ex) { + // no caching then - fine with me + } } if ($this->memoryCache) { $pathsToRequire = $this->memoryCache->get($class); diff --git a/lib/private/util.php b/lib/private/util.php index ea2eb98d23c..1cbb19eaec4 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -617,7 +617,7 @@ class OC_Util { if(is_null($id)) { // We need to guarantee at least one letter in instanceid so it can be used as the session_name $id = 'oc' . self::generateRandomBytes(10); - OC_Config::setValue('instanceid', $id); + OC_Config::$object->setValue('instanceid', $id); } return $id; } |