From 4c4fdc6f70e5b98b043609af11025200d09263c6 Mon Sep 17 00:00:00 2001 From: euromark Date: Mon, 6 May 2013 12:18:01 +0200 Subject: [PATCH] resolve unnecessary naming conflict in SQL dump output --- lib/Cake/View/Elements/sql_dump.ctp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Cake/View/Elements/sql_dump.ctp b/lib/Cake/View/Elements/sql_dump.ctp index 410ca72f4..cc194df14 100644 --- a/lib/Cake/View/Elements/sql_dump.ctp +++ b/lib/Cake/View/Elements/sql_dump.ctp @@ -20,22 +20,22 @@ if (!class_exists('ConnectionManager') || Configure::read('debug') < 2) { return false; } -$noLogs = !isset($logs); +$noLogs = !isset($sqlLogs); if ($noLogs): $sources = ConnectionManager::sourceList(); - $logs = array(); + $sqlLogs = array(); foreach ($sources as $source): $db = ConnectionManager::getDataSource($source); if (!method_exists($db, 'getLog')): continue; endif; - $logs[$source] = $db->getLog(); + $sqlLogs[$source] = $db->getLog(); endforeach; endif; if ($noLogs || isset($_forced_from_dbo_)): - foreach ($logs as $source => $logInfo): + foreach ($sqlLogs as $source => $logInfo): $text = $logInfo['count'] > 1 ? 'queries' : 'query'; printf( '', @@ -71,5 +71,5 @@ if ($noLogs || isset($_forced_from_dbo_)): Encountered unexpected $logs cannot generate SQL log

'; + echo '

Encountered unexpected $sqlLogs cannot generate SQL log

'; endif;