Merge pull request cakephp#1506 from oldskool/master

Phally · Phally · commit a64c205c5892 · 2013-08-12T10:20:46.000-07:00
View file conventions. Fixes cakephp#3949.
diff --git a/app/View/Layouts/flash.ctp b/app/View/Layouts/flash.ctp
@@ -23,9 +23,9 @@
 <?php echo $this->Html->charset(); ?>
 <title><?php echo $page_title; ?></title>
 
-<?php if (Configure::read('debug') == 0) { ?>
+<?php if (Configure::read('debug') == 0): ?>
 <meta http-equiv="Refresh" content="<?php echo $pause; ?>;url=<?php echo $url; ?>"/>
-<?php } ?>
+<?php endif; ?>
 <style><!--
 P { text-align:center; font:bold 1.1em sans-serif }
 A { color:#444; text-decoration:none }
@@ -35,4 +35,4 @@ A:HOVER { text-decoration: underline; color:#44E }
 <body>
 <p><a href="<?php echo $url; ?>"><?php echo $message; ?></a></p>
 </body>
-</html>
+</html>
diff --git a/app/View/Layouts/rss/default.ctp b/app/View/Layouts/rss/default.ctp
@@ -1,10 +1,10 @@
 <?php
-if (!isset($channel)) {
+if (!isset($channel)):
 	$channel = array();
-}
-if (!isset($channel['title'])) {
+endif;
+if (!isset($channel['title'])):
 	$channel['title'] = $title_for_layout;
-}
+endif;
 
 echo $this->Rss->document(
 	$this->Rss->channel(
diff --git a/app/View/Pages/home.ctp b/app/View/Pages/home.ctp
@@ -101,12 +101,12 @@ if (isset($filePresent)):
 	} catch (Exception $connectionError) {
 		$connected = false;
 		$errorMsg = $connectionError->getMessage();
-		if (method_exists($connectionError, 'getAttributes')) {
+		if (method_exists($connectionError, 'getAttributes')):
 			$attributes = $connectionError->getAttributes();
-			if (isset($errorMsg['message'])) {
+			if (isset($errorMsg['message'])):
 				$errorMsg .= '<br />' . $attributes['message'];
-			}
-		}
+			endif;
+		endif;
 	}
 ?>
 <p>
@@ -127,13 +127,13 @@ if (isset($filePresent)):
 <?php endif; ?>
 <?php
 	App::uses('Validation', 'Utility');
-	if (!Validation::alphaNumeric('cakephp')) {
+	if (!Validation::alphaNumeric('cakephp')):
 		echo '<p><span class="notice">';
 			echo __d('cake_dev', 'PCRE has not been compiled with Unicode support.');
 			echo '<br/>';
 			echo __d('cake_dev', 'Recompile PCRE with Unicode support by adding <code>--enable-unicode-properties</code> when configuring');
 		echo '</span></p>';
-	}
+	endif;
 ?>
 
 <p>
