Some fixes for bahnbewertung parser hook.

git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/trunk/extensions/wrreport@283 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/wrreport.body.php b/wrreport.body.php
index 44f0f939d9c4803593cfd8eafab779a39e753065..97c1ae200e25ad30d316397e908f041830990837 100644 (file)
--- a/wrreport.body.php
+++ b/wrreport.body.php
@@ -189,15 +189,15 @@ function wrReportTableRender($page_title = NULL) {
 
 /// \brief It returns an array of the "condition" (as number) and the date of the "most recent" report of the specified page (to decode as list($condition, $date);
 ///
-/// If no condition is present, NULL is returned
+/// If no condition is present, array(NULL, NULL) is returned
 function wrReportConditionRender($page_title) {
        $dbr = wfGetDB(DB_SLAVE);
-       $res = $dbr->select('wrreport', array('max(wrreport.id) as max'), array("page_title='Birgitzer Alm (vom Adelshof)'"));
+       $res = $dbr->select('wrreport', array('max(wrreport.id) as max'), array('page_title' => $page_title, 'condition is not null', 'date_invalid > now()'));
        //  select condition, date_report from wrreport where id = (select max(wrreport.id) as max from wrreport where page_title='Birgitzer Alm (vom Adelshof)' and date_invalid > now() and condition is not null);
-       if ($res->numRows() <= 0) return NULL;
+       if ($res->numRows() <= 0) return array(NULL, NULL);
        $row = $dbr->fetchObject($res);
        $res = $dbr->select('wrreport', array('condition', 'date_report'), array('id' => $row->max));
-       if ($res->numRows() <= 0) return NULL;
+       if ($res->numRows() <= 0) return array(NULL, NULL);
        $row = $dbr->fetchObject($res);
        return array($row->condition, $row->date_report);
 }