Increasing "sync" between app and skel directories. #247

Merged
merged 3 commits into from Oct 14, 2011

Projects

None yet

2 participants

@sitedyno

Additional differences between the 2 folders:

diff -r app/Console/cake.php lib/Cake/Console/Templates/skel/Console/cake.php
33c33
<       ini_set('include_path', $root . $ds. 'lib' . PATH_SEPARATOR . ini_get('include_path'));

---
>       ini_set('include_path', __CAKE_PATH__ . PATH_SEPARATOR . ini_get('include_path'));
diff -r app/webroot/index.php lib/Cake/Console/Templates/skel/webroot/index.php
59c59
<       //define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');

---
>       //define('CAKE_CORE_INCLUDE_PATH', __CAKE_PATH__);
diff -r app/webroot/test.php lib/Cake/Console/Templates/skel/webroot/test.php
56c56
<       //define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');

---
>       //define('CAKE_CORE_INCLUDE_PATH', __CAKE_PATH__);
71,73d70
<       if (function_exists('ini_set')) {
<               ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
<       }

Only in lib/Cake/Console/Templates/skel/Config/Schema: db_acl.sql
Only in lib/Cake/Console/Templates/skel/Config/Schema: i18n.sql
Only in lib/Cake/Console/Templates/skel/Config/Schema: sessions.sql
Only in lib/Cake/Console/Templates/skel/Controller: AppController.php
Only in lib/Cake/Console/Templates/skel/Controller: PagesController.php
Only in lib/Cake/Console/Templates/skel/Model: AppModel.php
Only in lib/Cake/Console/Templates/skel/tmp/cache/persistent: cake_core_cake_console_
Only in lib/Cake/Console/Templates/skel/tmp/cache/persistent: cake_core_cake_dev_
Only in lib/Cake/Console/Templates/skel/View/Emails/html: default.ctp
Only in lib/Cake/Console/Templates/skel/View/Emails/text: default.ctp
Only in lib/Cake/Console/Templates/skel/View/Helper: AppHelper.php
Only in lib/Cake/Console/Templates/skel/View/Layouts: ajax.ctp
Only in lib/Cake/Console/Templates/skel/View/Layouts: default.ctp
Only in lib/Cake/Console/Templates/skel/View/Layouts/Emails/html: default.ctp
Only in lib/Cake/Console/Templates/skel/View/Layouts/Emails/text: default.ctp
Only in lib/Cake/Console/Templates/skel/View/Layouts: flash.ctp
Only in lib/Cake/Console/Templates/skel/View/Layouts/js: default.ctp
Only in lib/Cake/Console/Templates/skel/View/Layouts/rss: default.ctp
Only in lib/Cake/Console/Templates/skel/View/Layouts/xml: default.ctp

Only in app/Console/Command: empty
Only in app/Console: Templates
Only in app/View/Emails/html: empty
Only in app/View/Emails/text: empty
Only in app/View/Layouts/Emails/html: empty
Only in app/View/Layouts/Emails/text: empty
Only in app/View/Layouts/js: empty
Only in app/View/Layouts/rss: empty
Only in app/View/Layouts/xml: empty
Only in app/webroot: files
@lorenzo
Member
lorenzo commented Oct 14, 2011

Thanks!!

@lorenzo lorenzo merged commit 36c9315 into cakephp:2.0 Oct 14, 2011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment