Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Minor comment and path changes. #132

Merged
merged 1 commit into from

3 participants

@thatcode

These are really minor, but I spotted them in passing and thought I'd deal with them.

The home.ctp line has recently been changed to that. Most web-visible lines have the APP prefix, so IMO this one should as well.

@ADmad
Collaborator

Would be better if you lowercase APP to app

@thatcode

I disagree. Web visible code paths have APP in capitals.

e.g (from the pages I've changed)
lib/Cake/Console/Templates/default/views/home.ctp Lines 28,32,93
lib/Cake/View/Pages/home.ctp Lines 53,57,115->117

The change to lib/Cake/console/Command/ConsoleShell.php is in a code comment, thus why it's lowercase and the others are not.

If you think they should all be lowercase, then maybe. But that would be a far larger change. However, APP is, IMO, better, as it means 'wherever your app is', not 'the app directory in your Cake Root' which may (if you've separated the 2, as I have) be different.

@markstory markstory merged commit 2725718 into cakephp:2.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 25, 2011
  1. @thatcode
This page is out of date. Refresh to see the latest.
View
2  lib/Cake/Console/Command/ConsoleShell.php
@@ -330,7 +330,7 @@ protected function _isValidModel($modelToCheck) {
}
/**
- * Reloads the routes configuration from config/routes.php, and compiles
+ * Reloads the routes configuration from app/Config/routes.php, and compiles
* all routes found
*
* @return boolean True if config reload was a success, otherwise false
View
2  lib/Cake/Console/Templates/default/views/home.ctp
@@ -46,7 +46,7 @@ endif;
echo '<span class=\"notice\">';
echo __d('cake_dev', 'Your database configuration file is NOT present.');
echo '<br/>';
- echo __d('cake_dev', 'Rename Config/database.php.default to Config/database.php');
+ echo __d('cake_dev', 'Rename APP/Config/database.php.default to APP/Config/database.php');
echo '</span>';
endif;
?>
View
2  lib/Cake/Routing/Router.php
@@ -473,7 +473,7 @@ public static function prefixes() {
}
/**
- * Parses given URL string. Returns 'routing' parametets for that url.
+ * Parses given URL string. Returns 'routing' parameters for that url.
*
* @param string $url URL to be parsed
* @return array Parsed elements from URL
View
2  lib/Cake/View/Pages/home.ctp
@@ -71,7 +71,7 @@ endif;
echo '<span class="notice">';
echo __d('cake_dev', 'Your database configuration file is NOT present.');
echo '<br/>';
- echo __d('cake_dev', 'Rename Config/database.php.default to Config/database.php');
+ echo __d('cake_dev', 'Rename APP/Config/database.php.default to APP/Config/database.php');
echo '</span>';
endif;
?>
Something went wrong with that request. Please try again.