http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94696
Revision: 94696
Author: jeroendedauw
Date: 2011-08-16 22:06:21 +0000 (Tue, 16 Aug 2011)
Log Message:
-----------
fix strict warnings
Modified Paths:
--------------
trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php
trunk/extensions/SemanticResultFormats/RELEASE-NOTES
trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotBar.php
trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotPie.php
Modified: trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php
===================================================================
--- trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php
2011-08-16 21:59:10 UTC (rev 94695)
+++ trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php
2011-08-16 22:06:21 UTC (rev 94696)
@@ -159,7 +159,7 @@
// handle the 'color=' value, whether it came
// from a compound query or a regular one
// handling is different for SMW 1.5+
- $realFunction = array( 'SMWQueryResult',
'getResults' );
+ $realFunction = array( $field, 'getResults' );
if ( is_callable( $realFunction ) ) {
$res_subject =
$field->getResultSubject();
if ( isset(
$res_subject->display_options )
Modified: trunk/extensions/SemanticResultFormats/RELEASE-NOTES
===================================================================
--- trunk/extensions/SemanticResultFormats/RELEASE-NOTES 2011-08-16
21:59:10 UTC (rev 94695)
+++ trunk/extensions/SemanticResultFormats/RELEASE-NOTES 2011-08-16
22:06:21 UTC (rev 94696)
@@ -6,6 +6,7 @@
* Fixed rendering bug in the tagcloud format occuring for inline queries.
* Fixed jqPlotBar and jqPlotPie rendering on Special:Ask and other special
pages.
+Cleaned up the jqPlotBar format somewhat.
== SRF 1.6 ==
Modified: trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotBar.php
===================================================================
--- trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotBar.php
2011-08-16 21:59:10 UTC (rev 94695)
+++ trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotBar.php
2011-08-16 22:06:21 UTC (rev 94696)
@@ -103,7 +103,7 @@
$scripts = array();
if ( !$smwgJQueryIncluded ) {
- $realFunction = array( 'OutputPage', 'includeJQuery' );
+ $realFunction = array( $wgOut, 'includeJQuery' );
if ( is_callable( $realFunction ) ) {
$wgOut->includeJQuery();
} else {
Modified: trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotPie.php
===================================================================
--- trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotPie.php
2011-08-16 21:59:10 UTC (rev 94695)
+++ trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotPie.php
2011-08-16 22:06:21 UTC (rev 94696)
@@ -79,7 +79,7 @@
global $smwgJQueryIncluded, $srfgJQPlotIncluded;
if ( !$smwgJQueryIncluded ) {
- $realFunction = array( 'OutputPage', 'includeJQuery' );
+ $realFunction = array( $wgOut, 'includeJQuery' );
if ( is_callable( $realFunction ) ) {
$wgOut->includeJQuery();
} else {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
