Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0

differences upon merging.

Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/libs/cache/file.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/i18n.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/model/model_write.test.php
This commit is contained in:
mark_story 2010-09-24 23:27:22 -04:00
commit f21161ef46
26 changed files with 248 additions and 92 deletions

View file

@ -299,6 +299,7 @@ class FileEngine extends CacheEngine {
if ($this->_init && !($dir->isDir() && $dir->isWritable())) {
$this->_init = false;
trigger_error(sprintf(__('%s is not writable'), $this->settings['path']), E_USER_WARNING);
return false;
}
return true;
}