Permalink
Browse files

Removed concatenations in gettext $msg param. Closes #3986.

  • Loading branch information...
1 parent bcfa077 commit aa7c912c151c61825b716d8ea03ad59befb4dd25 @dmromanov dmromanov committed Aug 14, 2013
Showing with 4 additions and 4 deletions.
  1. +2 −2 lib/Cake/Model/Permission.php
  2. +2 −2 lib/Cake/View/Errors/missing_plugin.ctp
View
4 lib/Cake/Model/Permission.php
@@ -91,12 +91,12 @@ public function check($aro, $aco, $action = "*") {
$acoPath = $this->Aco->node($aco);
if (!$aroPath || !$acoPath) {
- trigger_error(__d('cake_dev', "DbAcl::check() - Failed ARO/ACO node lookup in permissions check. Node references:\nAro: ") . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
+ trigger_error(__d('cake_dev', "DbAcl::check() - Failed ARO/ACO node lookup in permissions check. Node references:\nAro: %s\nAco: %s", print_r($aro, true), print_r($aco, true)), E_USER_WARNING);
return false;
}
if (!$acoPath) {
- trigger_error(__d('cake_dev', "DbAcl::check() - Failed ACO node lookup in permissions check. Node references:\nAro: ") . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
+ trigger_error(__d('cake_dev', "DbAcl::check() - Failed ACO node lookup in permissions check. Node references:\nAro: %s\nAco: %s", print_r($aro, true), print_r($aco, true)), E_USER_WARNING);
return false;
}
View
4 lib/Cake/View/Errors/missing_plugin.ctp
@@ -24,7 +24,7 @@
</p>
<p class="error">
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
- <?php echo __d('cake_dev', 'Make sure your plugin %s is in the ' . APP_DIR . DS . 'Plugin directory and was loaded', $plugin); ?>
+ <?php echo __d('cake_dev', 'Make sure your plugin %s is in the %s directory and was loaded', $plugin, APP_DIR . DS . 'Plugin'); ?>
</p>
<pre>
&lt;?php
@@ -33,7 +33,7 @@ CakePlugin::load('<?php echo h($plugin); ?>');
</pre>
<p class="notice">
<strong><?php echo __d('cake_dev', 'Loading all plugins'); ?>: </strong>
- <?php echo __d('cake_dev', 'If you wish to load all plugins at once, use the following line in your ' . APP_DIR . DS . 'Config' . DS . 'bootstrap.php file'); ?>
+ <?php echo __d('cake_dev', 'If you wish to load all plugins at once, use the following line in your %s file', APP_DIR . DS . 'Config' . DS . 'bootstrap.php'); ?>
</p>
<pre>
CakePlugin::loadAll();

0 comments on commit aa7c912

Please sign in to comment.