From dd5ad1537ca3682d0e19c61652a7262681e1797e Mon Sep 17 00:00:00 2001 From: phpnut Date: Tue, 4 Oct 2005 18:33:48 +0000 Subject: [PATCH] a few corrections to previous commits git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1076 3807eeeb-6ff5-0310-8944-8be069107fe0 --- app/config/core.php | 24 +++++++++---------- .../libs/view/templates/layouts/default.thtml | 2 +- cake/libs/view/templates/pages/home.thtml | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/config/core.php b/app/config/core.php index 27ab90bcb..a2b2b046f 100644 --- a/app/config/core.php +++ b/app/config/core.php @@ -31,19 +31,19 @@ * @license http://www.opensource.org/licenses/mit-license.php The MIT License */ +/** + * If you do not have mod rewrite on your system + * or if you prefer to use CakePHP pretty urls. + * uncomment the line below. + * Note: If you do have mod rewrite but prefer the + * CakePHP pretty urls, you also have to remove the + * .htaccess files + * release/.htaccess + * release/app/.htaccess + * release/app/webroot/.htaccess + */ +//define ('BASE_URL', $_SERVER['SCRIPT_NAME']); -if(function_exists('apache_get_modules')) -{ - $modules = apache_get_modules(); - if(!in_array('mod_rewrite', $modules) || !is_file('.htaccess')) - { - define ('BASE_URL', $_SERVER['SCRIPT_NAME']); - } -} -else -{ - define ('BASE_URL', $_SERVER['SCRIPT_NAME']); -} /** * Set debug level here: diff --git a/cake/libs/view/templates/layouts/default.thtml b/cake/libs/view/templates/layouts/default.thtml index 163b2fac4..4c866e139 100644 --- a/cake/libs/view/templates/layouts/default.thtml +++ b/cake/libs/view/templates/layouts/default.thtml @@ -52,7 +52,7 @@
diff --git a/cake/libs/view/templates/pages/home.thtml b/cake/libs/view/templates/pages/home.thtml index 7db24c405..869325af1 100644 --- a/cake/libs/view/templates/pages/home.thtml +++ b/cake/libs/view/templates/pages/home.thtml @@ -17,7 +17,7 @@ Our primary goal is to provide a structured framework that enables PHP users at to rapidly develop robust web applications, without any loss to flexibility.

What's New

-

Release 0.10.0.1073_dev with:

+

Release 0.10.0.1076_dev with: