Index: branches/RC/core/kernel/application.php =================================================================== diff -u -r10715 -r10763 --- branches/RC/core/kernel/application.php (.../application.php) (revision 10715) +++ branches/RC/core/kernel/application.php (.../application.php) (revision 10763) @@ -176,7 +176,7 @@ * @var unknown_type */ var $CurrentNTag = null; - + /** * Memcache object pointer * @@ -218,10 +218,11 @@ } return $instance; } - + function InitMemcached() { $memcached_servers = 'localhost:11211'; // $this->Application->ConfigValue('MemcachedServers'); + $memcached_servers = ''; // temporarily disabled; if ($memcached_servers && class_exists('Memcache')) { $this->Memcached = new Memcache(); @@ -234,15 +235,15 @@ //try to set something to cache, if not working - set $this->Memcached to null } - + function CacheSet($name, $value, $expiration) { if (isset($this->Memcached)) { return $this->Memcached->set($name, $value, 0, $expiration); } return false; } - + function CacheGet($name) { if (isset($this->Memcached)) { @@ -263,9 +264,9 @@ function Init() { if($this->InitDone) return false; - + $this->InitMemcached(); - + if (!constOn('SKIP_OUT_COMPRESSION')) { ob_start(); // collect any output from method (other then tags) into buffer } @@ -297,34 +298,34 @@ if( defined('DEBUG_MODE') && $this->isDebugMode() ) { $this->Debugger->appendTimestamp('Before UnitConfigReader'); } - + $this->UnitConfigReader =& $this->recallObject('kUnitConfigReader'); $this->UnitConfigReader->scanModules(MODULES_PATH); $this->registerModuleConstants(); if( defined('DEBUG_MODE') && $this->isDebugMode() ) { $this->Debugger->appendTimestamp('After UnitConfigReader'); } - + $rewrite_on = $this->ConfigValue('UseModRewrite'); // admin=1 - when front is browsed using admin session $admin_on = getArrayValue($_REQUEST, 'admin') || $this->IsAdmin(); define('MOD_REWRITE', $rewrite_on && !$admin_on ? 1 : 0); $this->HttpQuery =& $this->recallObject('HTTPQuery'); - + if( defined('DEBUG_MODE') && $this->isDebugMode() ) { $this->Debugger->appendTimestamp('Processed HTTPQuery initial'); } - + $this->Session =& $this->recallObject('Session'); - + if( defined('DEBUG_MODE') && $this->isDebugMode() ) { $this->Debugger->appendTimestamp('Processed Session'); } $this->HttpQuery->AfterInit(); - + if( defined('DEBUG_MODE') && $this->isDebugMode() ) { $this->Debugger->appendTimestamp('Processed HTTPQuery AfterInit'); } @@ -333,13 +334,13 @@ $this->InitConfig(); $this->Phrases->Init('phrases'); - + if( defined('DEBUG_MODE') && $this->isDebugMode() ) { $this->Debugger->appendTimestamp('Loaded cache and phrases'); } $this->UnitConfigReader->AfterConfigRead(); - + if( defined('DEBUG_MODE') && $this->isDebugMode() ) { $this->Debugger->appendTimestamp('Processed AfterConfigRead'); }