Robert Vogel has submitted this change and it was merged.
Change subject: fixed crash when query is broken
......................................................................
fixed crash when query is broken
Change-Id: Id4888fb92f4fa9b22f307dc7fcd136c2338a8a52
(cherry picked from commit 82885c371e5ce7d439899ed8197989bdee0a1b4b)
---
M Statistics/includes/MySQLDbReader.class.php
1 file changed, 11 insertions(+), 5 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Statistics/includes/MySQLDbReader.class.php
b/Statistics/includes/MySQLDbReader.class.php
index fd3cb74..f3dde83 100644
--- a/Statistics/includes/MySQLDbReader.class.php
+++ b/Statistics/includes/MySQLDbReader.class.php
@@ -16,13 +16,13 @@
/**
* Reads data from database for Statistics for BlueSpice.
* @package BlueSpice_Extensions
- * @subpackage Statistics
+ * @subpackage Statistics
*/
class MySQLDbReader extends StatsDataProvider {
-
+
/**
* Database server host
- * @var string
+ * @var string
*/
public $host;
/**
@@ -59,9 +59,12 @@
$sql = str_replace("@period", "BETWEEN
'".$interval->getStartTS("YmdHis")."' AND '".$interval->getEndTS("YmdHis")."'
", $sql);
$sql = str_replace("@start", "
'".$interval->getStartTS("YmdHis")."' ", $sql);
- $sql = str_replace("@end", "
'".$interval->getEndTS("YmdHis")."' ", $sql);
+ $sql = str_replace("@end", "
'".$interval->getEndTS("YmdHis")."' ", $sql);
$res = mysql_query($sql);
+ if (!$res){
+ return 0;
+ }
$row = mysql_fetch_array($res);
$item = $row[0];
@@ -90,6 +93,9 @@
$sql = str_replace("@end", "
'".$interval->getEndTS("YmdHis")."' ", $sql);
//echo '<br>'.$sql;
$res = mysql_query($sql);
+ if (!$res){
+ return $uniqueValues;
+ }
while ($row = mysql_fetch_array($res)) {
$rowArr = array();
@@ -97,7 +103,7 @@
$rowArr[] = $row[$i];
$uniqueValues[] = $rowArr;
}
-
+
--
To view, visit https://gerrit.wikimedia.org/r/192283
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4888fb92f4fa9b22f307dc7fcd136c2338a8a52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Tweichart <weich...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
