Attached Files | 0001-BUG-Fix-undefined-variable-usage-in-test-viewer.patch [^] (1,411 bytes) 2013-12-07 18:09 [Show Content] [Hide Content]From 4c96479cd4c9de4056a63c93731876cd5262a977 Mon Sep 17 00:00:00 2001
From: Igor Murzov <e-mail@date.by>
Date: Thu, 10 Oct 2013 19:41:04 +0400
Subject: [PATCH] BUG: Fix undefined variable usage in test viewer.
This commit fixes the following issue:
PHP Notice: Undefined variable: extras in /var/www/cdash/viewTest.php on line 273,
referer: http://localhost/cdash/viewTest.php?buildid=391
---
viewTest.php | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/viewTest.php b/viewTest.php
index 84c0725..39ceaf6 100644
--- a/viewTest.php
+++ b/viewTest.php
@@ -269,10 +269,10 @@ while($row=pdo_fetch_array($getcolumnnumber))
$columncount=pdo_num_rows($getcolumnnumber);
// If at least one column is selected
-if($onlypassed) $extras="AND build2test.status='passed'";
-elseif($onlyfailed) $extras="AND build2test.status='failed'";
-elseif($onlynotrun) $extras="AND build2test.status='notrun'";
-$extras.=" ORDER BY test.id, testmeasurement.name";
+$extras = "";
+if($onlypassed) $extras .= "AND build2test.status='passed'";
+elseif($onlyfailed) $extras .= "AND build2test.status='failed'";
+elseif($onlynotrun) $extras .= "AND build2test.status='notrun'";
if($columncount>0)
{
@@ -287,6 +287,7 @@ if($columncount>0)
WHERE build.id= '$buildid'
AND measurement.testpage=1 $onlydelta_extra
$extras
+ ORDER BY test.id, testmeasurement.name
");
}
--
1.8.4
|