diff --git a/app/Controller/PagesController.php.diff b/app/Controller/PagesController.php.diff index eed738bde..9474723a6 100644 --- a/app/Controller/PagesController.php.diff +++ b/app/Controller/PagesController.php.diff @@ -1,5 +1,5 @@ ---- PagesController.php.orig 2012-09-20 15:44:21.264671022 +0200 -+++ PagesController.php 2012-09-06 13:45:13.023544947 +0200 +--- app/Controller/PagesController.php.orig 2012-09-20 15:44:21.264671022 +0200 ++++ app/Controller/PagesController.php 2012-09-06 13:45:13.023544947 +0200 @@ -52,6 +52,9 @@ */ public $uses = array(); diff --git a/app/View/Helper/AppHelper.php.diff b/app/View/Helper/AppHelper.php.diff index 2024b98a7..aba75a897 100644 --- a/app/View/Helper/AppHelper.php.diff +++ b/app/View/Helper/AppHelper.php.diff @@ -1,5 +1,5 @@ ---- AppHelper.php.orig 2012-09-20 15:32:09.844653514 +0200 -+++ AppHelper.php 2012-09-06 13:45:12.791544951 +0200 +--- app/View/Helper/AppHelper.php.orig 2012-09-20 15:32:09.844653514 +0200 ++++ app/View/Helper/AppHelper.php 2012-09-06 13:45:12.791544951 +0200 @@ -31,4 +31,10 @@ * @package app.View.Helper */ diff --git a/app/View/Layouts/Emails/html/default.ctp.diff b/app/View/Layouts/Emails/html/default.ctp.diff index dcd296bf5..8651df00d 100644 --- a/app/View/Layouts/Emails/html/default.ctp.diff +++ b/app/View/Layouts/Emails/html/default.ctp.diff @@ -1,5 +1,5 @@ ---- default.ctp.orig 2012-09-20 15:29:11.952649256 +0200 -+++ default.ctp 2012-09-06 13:45:13.079544947 +0200 +--- app/View/Layouts/Emails/html/default.ctp.orig 2012-09-20 15:29:11.952649256 +0200 ++++ app/View/Layouts/Emails/html/default.ctp 2012-09-06 13:45:13.079544947 +0200 @@ -24,6 +24,5 @@
diff --git a/app/View/Layouts/Emails/text/default.ctp.diff b/app/View/Layouts/Emails/text/default.ctp.diff index 8491f8751..689cb41b0 100644 --- a/app/View/Layouts/Emails/text/default.ctp.diff +++ b/app/View/Layouts/Emails/text/default.ctp.diff @@ -1,5 +1,5 @@ ---- default.ctp.orig 2012-09-20 15:29:00.464648980 +0200 -+++ default.ctp 2012-09-06 13:45:12.635544956 +0200 +--- app/View/Layouts/Emails/text/default.ctp.orig 2012-09-20 15:29:00.464648980 +0200 ++++ app/View/Layouts/Emails/text/default.ctp 2012-09-06 13:45:12.635544956 +0200 @@ -17,5 +17,3 @@ */ ?> diff --git a/app/View/Layouts/default.ctp.diff b/app/View/Layouts/default.ctp.diff index 99c3f2b4b..d4be8c4c6 100644 --- a/app/View/Layouts/default.ctp.diff +++ b/app/View/Layouts/default.ctp.diff @@ -1,5 +1,5 @@ ---- default.ctp.orig 2012-09-20 15:35:36.384658456 +0200 -+++ default.ctp 2012-09-20 15:36:38.128659936 +0200 +--- app/View/Layouts/default.ctp.orig 2012-09-20 15:35:36.384658456 +0200 ++++ app/View/Layouts/default.ctp 2012-09-20 15:36:38.128659936 +0200 @@ -16,44 +16,53 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ diff --git a/app/webroot/css/cake.generic.css.diff b/app/webroot/css/cake.generic.css.diff index 6204731d3..2eb266725 100644 --- a/app/webroot/css/cake.generic.css.diff +++ b/app/webroot/css/cake.generic.css.diff @@ -1,5 +1,8 @@ ---- cake.generic.css.orig 2012-09-20 15:53:24.716684032 +0200 -+++ cake.generic.css 2012-09-20 14:00:58.772522542 +0200 + +This one has to be checked..given i think it's not updated the previous CakePHP update. + +--- app/webroot/css/cake.generic.css.orig 2012-09-20 15:53:24.716684032 +0200 ++++ app/webroot/css/cake.generic.css 2012-09-20 14:00:58.772522542 +0200 @@ -4,12 +4,12 @@ * Generic CSS for CakePHP * diff --git a/app/webroot/index.php.diff b/app/webroot/index.php.diff index 8516df45a..d3c5e80f6 100644 --- a/app/webroot/index.php.diff +++ b/app/webroot/index.php.diff @@ -1,5 +1,5 @@ ---- index.php.orig 2012-09-20 15:51:02.508680629 +0200 -+++ index.php 2012-09-06 13:45:12.555544956 +0200 +--- app/webroot/index.php.orig 2012-09-20 15:51:02.508680629 +0200 ++++ app/webroot/index.php 2012-09-06 13:45:12.555544956 +0200 @@ -86,6 +86,10 @@ trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR); } diff --git a/build/patches/app_Controller_PagesController.php.diff b/build/patches/app_Controller_PagesController.php.diff new file mode 100644 index 000000000..9474723a6 --- /dev/null +++ b/build/patches/app_Controller_PagesController.php.diff @@ -0,0 +1,12 @@ +--- app/Controller/PagesController.php.orig 2012-09-20 15:44:21.264671022 +0200 ++++ app/Controller/PagesController.php 2012-09-06 13:45:13.023544947 +0200 +@@ -52,6 +52,9 @@ + */ + public $uses = array(); + ++ public function isAuthorized($user) { ++ return true; ++ } + /** + * Displays a view + * diff --git a/build/patches/app_View_Helper_AppHelper.php.diff b/build/patches/app_View_Helper_AppHelper.php.diff new file mode 100644 index 000000000..aba75a897 --- /dev/null +++ b/build/patches/app_View_Helper_AppHelper.php.diff @@ -0,0 +1,13 @@ +--- app/View/Helper/AppHelper.php.orig 2012-09-20 15:32:09.844653514 +0200 ++++ app/View/Helper/AppHelper.php 2012-09-06 13:45:12.791544951 +0200 +@@ -31,4 +31,10 @@ + * @package app.View.Helper + */ + class AppHelper extends Helper { ++ function url($url = null, $full = false) { ++ if(is_array($url) && !isset($url['admin'])){ ++ $url['admin'] = false; ++ } ++ return parent::url($url, $full); ++ } + } diff --git a/build/patches/app_View_Layouts_Emails_html_default.ctp.diff b/build/patches/app_View_Layouts_Emails_html_default.ctp.diff new file mode 100644 index 000000000..8651df00d --- /dev/null +++ b/build/patches/app_View_Layouts_Emails_html_default.ctp.diff @@ -0,0 +1,10 @@ +--- app/View/Layouts/Emails/html/default.ctp.orig 2012-09-20 15:29:11.952649256 +0200 ++++ app/View/Layouts/Emails/html/default.ctp 2012-09-06 13:45:13.079544947 +0200 +@@ -24,6 +24,5 @@ + + + +-This email was sent using the CakePHP Framework
+ + +\ No newline at end of file diff --git a/build/patches/app_View_Layouts_Emails_text_default.ctp.diff b/build/patches/app_View_Layouts_Emails_text_default.ctp.diff new file mode 100644 index 000000000..689cb41b0 --- /dev/null +++ b/build/patches/app_View_Layouts_Emails_text_default.ctp.diff @@ -0,0 +1,8 @@ +--- app/View/Layouts/Emails/text/default.ctp.orig 2012-09-20 15:29:00.464648980 +0200 ++++ app/View/Layouts/Emails/text/default.ctp 2012-09-06 13:45:12.635544956 +0200 +@@ -17,5 +17,3 @@ + */ + ?> + +- +-This email was sent using the CakePHP Framework, http://cakephp.org. diff --git a/build/patches/app_View_Layouts_default.ctp.diff b/build/patches/app_View_Layouts_default.ctp.diff new file mode 100644 index 000000000..d4be8c4c6 --- /dev/null +++ b/build/patches/app_View_Layouts_default.ctp.diff @@ -0,0 +1,66 @@ +--- app/View/Layouts/default.ctp.orig 2012-09-20 15:35:36.384658456 +0200 ++++ app/View/Layouts/default.ctp 2012-09-20 15:36:38.128659936 +0200 +@@ -16,44 +16,53 @@ + * @license MIT License (http://www.opensource.org/licenses/mit-license.php) + */ + +-$cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework'); + ?> + + + + Html->charset(); ?> +