Skip to content

Commit fecc687

Browse files
committed
Cleanup missing view/layout errors.
Fix formatting issues and make path listings correct.
1 parent e548dfc commit fecc687

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

lib/Cake/View/Errors/missing_layout.ctp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,16 @@
2121
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
2222
<?php echo __d('cake_dev', 'The layout file %s can not be found or does not exist.', '<em>' . h($file) . '</em>'); ?>
2323
</p>
24-
<p class="error">
25-
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
26-
<?php echo __d('cake_dev', 'Confirm you have created the file: %s', '<em>' . h($file) . '</em>'); ?>
27-
</p>
2824

2925
<p>
30-
You should create "<?php echo h($file); ?>" in one of he following paths:
26+
<?php echo __d('cake_dev', 'Confirm you have created the file: %s', h($file)); ?>
27+
in one of the following paths:
3128
</p>
3229
<ul>
3330
<?php
3431
$paths = $this->_paths($this->plugin);
3532
foreach ($paths as $path):
36-
echo sprintf('<li>%s%s%s</li>', h($path), DS, h($file));
33+
echo sprintf('<li>%s%s</li>', h($path), h($file));
3734
endforeach;
3835
?>
3936
</ul>

lib/Cake/View/Errors/missing_view.ctp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
*
4-
*
53
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
64
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
75
*
@@ -21,19 +19,16 @@
2119
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
2220
<?php echo __d('cake_dev', 'The view for %1$s%2$s was not found.', '<em>' . h(Inflector::camelize($this->request->controller)) . 'Controller::</em>', '<em>' . h($this->request->action) . '()</em>'); ?>
2321
</p>
24-
<p class="error">
25-
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
26-
<?php echo __d('cake_dev', 'Confirm you have created the file: %s', h($file)); ?>
27-
</p>
2822

2923
<p>
30-
You should create "<?php echo h($file); ?>" in one of he following paths:
24+
<?php echo __d('cake_dev', 'Confirm you have created the file: %s', h($file)); ?>
25+
in one of the following paths:
3126
</p>
3227
<ul>
3328
<?php
3429
$paths = $this->_paths($this->plugin);
3530
foreach ($paths as $path):
36-
echo sprintf('<li>%s%s%s</li>', h($path), DS, h($file));
31+
echo sprintf('<li>%s%s</li>', h($path), h($file));
3732
endforeach;
3833
?>
3934
</ul>

0 commit comments

Comments
 (0)