Fixed an issue in the Database_Statement::debugQuery() method

leofeyer · leofeyer · commit 3c44697313d6 · 2012-01-12T18:40:57.000+01:00
diff --git a/assets/css/index.html b/assets/css/index.html
@@ -1,8 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="en">
 <head>
+<meta charset="utf-8">
 <title>Blank page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 </head>
 <body>
 </body>
diff --git a/assets/images/index.html b/assets/images/index.html
@@ -1,8 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="en">
 <head>
+<meta charset="utf-8">
 <title>Blank page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 </head>
 <body>
 </body>
diff --git a/assets/js/index.html b/assets/js/index.html
@@ -1,8 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="en">
 <head>
+<meta charset="utf-8">
 <title>Blank page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 </head>
 <body>
 </body>
diff --git a/share/index.html b/share/index.html
@@ -1,8 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="en">
 <head>
+<meta charset="utf-8">
 <title>Blank page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 </head>
 <body>
 </body>
diff --git a/system/library/Contao/Database/Statement.php b/system/library/Contao/Database/Statement.php
@@ -398,22 +398,22 @@ protected function debugQuery($objResult=null)
 
 		$arrData[] = $this->strQuery;
 
-		if ($objResult !== null || strncmp(strtoupper($this->strQuery), 'SELECT', 6) !== 0)
+		if ($objResult === null || strncmp(strtoupper($this->strQuery), 'SELECT', 6) !== 0)
 		{
 			$arrData[] = sprintf('%d rows affected', $this->affectedRows);
 			$GLOBALS['TL_DEBUG']['db'][] = $arrData;
-
-			return;
 		}
+		else
+		{
+			$arrData[] = sprintf('%s rows returned', $objResult->numRows);
 
-		$arrData[] = sprintf('%s rows returned', $objResult->numRows);
+			if (($arrExplain = $this->explain()) != false)
+			{
+				$arrData[] = $arrExplain;
+			}
 
-		if (($arrExplain = $this->explain()) != false)
-		{
-			$arrData[] = $arrExplain;
+			$GLOBALS['TL_DEBUG']['db'][] = $arrData;
 		}
-
-		$GLOBALS['TL_DEBUG']['db'][] = $arrData;
 	}
 
 
