http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97669
Revision: 97669
Author: yaron
Date: 2011-09-20 21:46:26 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Filter's name value is only saved to the XML if it's not empty; other small
improvements
Modified Paths:
--------------
trunk/extensions/SemanticDrilldown/includes/SD_PageSchemas.php
Modified: trunk/extensions/SemanticDrilldown/includes/SD_PageSchemas.php
===================================================================
--- trunk/extensions/SemanticDrilldown/includes/SD_PageSchemas.php
2011-09-20 21:41:40 UTC (rev 97668)
+++ trunk/extensions/SemanticDrilldown/includes/SD_PageSchemas.php
2011-09-20 21:46:26 UTC (rev 97669)
@@ -14,7 +14,7 @@
* from the Page Schemas extension.
*/
public static function createPageSchemasObject( $objectName,
$xmlForField, &$object ) {
- $sdarray = array();
+ $sd_array = array();
if ( $objectName != "semanticdrilldown_Filter" ) {
return true;
}
@@ -27,12 +27,12 @@
foreach ( $value->children() as
$val ) {
$l_values[] =
(string)$val;
}
- $sdarray['Values'] = $l_values;
+ $sd_array['Values'] = $l_values;
} else {
- $sdarray[$prop] =
(string)$value;
+ $sd_array[$prop] =
(string)$value;
}
}
- $object['sd'] = $sdarray;
+ $object['sd'] = $sd_array;
return true;
}
}
@@ -57,7 +57,7 @@
}
if ( array_key_exists( 'Name', $filter_array ) ) {
- $filterName = $filter_array['Name'];
+ $filterName = $filter_array['Name'];
} else {
$filterName = '';
}
@@ -174,7 +174,9 @@
if ( substr( $var, 0, 15 ) == 'sd_filter_name_' ) {
$xml = '<semanticdrilldown_Filter>';
$fieldNum = substr( $var, 15 );
- $xml .= '<Name>'.$val.'</Name>';
+ if ( !empty( $val ) ) {
+ $xml .= '<Name>' . $val . '</Name>';
+ }
} elseif ( substr( $var, 0, 17 ) ==
'sd_values_source_') {
if ( $val == 'category' ) {
$xml .= '<ValuesFromCategory>' .
$request->getText('sd_category_name_' . $fieldNum) . '</ValuesFromCategory>';
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
