Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '2.0' of github.com:cakephp/cakephp into 2.0

  • Loading branch information...
commit 9f1242492d7be8dc4a12514f45c11ea59637217e 2 parents a34358f + 3474837
@lorenzo lorenzo authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  lib/Cake/View/Errors/missing_datasource_config.ctp
View
2  lib/Cake/View/Errors/missing_datasource_config.ctp
@@ -19,7 +19,7 @@
<h2><?php echo __d('cake_dev', 'Missing Datasource Configuration'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
- <?php echo __d('cake_dev', 'The datasource configuration %1$s was not found in databases.php.', '<em>' . $config . '</em>'); ?>
+ <?php echo __d('cake_dev', 'The datasource configuration %1$s was not found in database.php.', '<em>' . $config . '</em>'); ?>
</p>
<p class="notice">
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
Please sign in to comment.
Something went wrong with that request. Please try again.