wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4894 from owncloud/fixing-4620-master

Browse source 
Fixing broken layout in master due to APC enabled
This commit is contained in:
Owen Winkler 2013-10-01 17:51:33 -07:00
commit 535ed8369f
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/autoloader.php
View file

@ -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);

2
lib/private/util.php
View file

@ -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;
}