Changing sql_dump element so it only shows if there is no $logs varia…

…ble set in the view. Overwriting it could adversely effect helper references. Fixes #998
cakephp · Aug 11, 2010 · da9c0da · da9c0da
1 parent 1371cef
commit da9c0da
Showing 1 changed file with 24 additions and 21 deletions.
diff --git a/cake/libs/view/elements/sql_dump.ctp b/cake/libs/view/elements/sql_dump.ctp
@@ -20,9 +20,9 @@
 if (!class_exists('ConnectionManager') || Configure::read('debug') < 2) {
 	return false;
 }
-
-$sources = ConnectionManager::sourceList();
 if (!isset($logs)):
+	$sources = ConnectionManager::sourceList();
+
 	$logs = array();
 	foreach ($sources as $source):
 		$db =& ConnectionManager::getDataSource($source);
@@ -31,24 +31,27 @@ if (!isset($logs)):
 		endif;
 		$logs[$source] = $db->getLog();
 	endforeach;
-endif;
 
-foreach ($logs as $source => $logInfo):
-	$text = $logInfo['count'] > 1 ? 'queries' : 'query';
-	printf(
-		'<table class="cake-sql-log" id="cakeSqlLog_%s" summary="Cake SQL Log" cellspacing="0" border = "0">',
-		preg_replace('/[^A-Za-z0-9_]/', '_', uniqid(time(), true))
-	);
-	printf('<caption>(%s) %s %s took %s ms</caption>', $source, $logInfo['count'], $text, $logInfo['time']);
-?>
-<thead>
-	<tr><th>Nr</th><th>Query</th><th>Error</th><th>Affected</th><th>Num. rows</th><th>Took (ms)</th></tr>
-</thead>
-<tbody>
-<?php
-	foreach ($logInfo['log'] as $k => $i) :
-		echo "<tr><td>" . ($k + 1) . "</td><td>" . h($i['query']) . "</td><td>{$i['error']}</td><td style = \"text-align: right\">{$i['affected']}</td><td style = \"text-align: right\">{$i['numRows']}</td><td style = \"text-align: right\">{$i['took']}</td></tr>\n";
-	endforeach;
+
+	foreach ($logs as $source => $logInfo):
+		$text = $logInfo['count'] > 1 ? 'queries' : 'query';
+		printf(
+			'<table class="cake-sql-log" id="cakeSqlLog_%s" summary="Cake SQL Log" cellspacing="0" border = "0">',
+			preg_replace('/[^A-Za-z0-9_]/', '_', uniqid(time(), true))
+		);
+		printf('<caption>(%s) %s %s took %s ms</caption>', $source, $logInfo['count'], $text, $logInfo['time']);
+	?>
+	<thead>
+		<tr><th>Nr</th><th>Query</th><th>Error</th><th>Affected</th><th>Num. rows</th><th>Took (ms)</th></tr>
+	</thead>
+	<tbody>
+	<?php
+		foreach ($logInfo['log'] as $k => $i) :
+			echo "<tr><td>" . ($k + 1) . "</td><td>" . h($i['query']) . "</td><td>{$i['error']}</td><td style = \"text-align: right\">{$i['affected']}</td><td style = \"text-align: right\">{$i['numRows']}</td><td style = \"text-align: right\">{$i['took']}</td></tr>\n";
+		endforeach;
+	?>
+	</tbody></table>
+	<?php 
+	endforeach; 
+endif;
 ?>
-</tbody></table>
-<?php endforeach; ?>