| Index: trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php |
| — | — | @@ -600,7 +600,7 @@ |
| 601 | 601 | |
| 602 | 602 | function smwfParseFieldElements( $field_xml, &$text_object ) { |
| 603 | 603 | foreach ( $field_xml->children() as $tag => $child ) { |
| 604 | | - if ( $tag == "Property" ) { |
| | 604 | + if ( $tag == "semanticmediawiki_Property" ) { |
| 605 | 605 | $text = ""; |
| 606 | 606 | $text = PageSchemas::tableMessageRowHTML( "paramAttr", "SemanticMediaWiki", (string)$tag ); |
| 607 | 607 | $propName = $child->attributes()->name; |
| — | — | @@ -622,7 +622,7 @@ |
| 623 | 623 | $field_count = 0; //counts the number of fields |
| 624 | 624 | foreach( $field_all as $field ) { //for each Field, retrieve smw properties and fill $prop_name , $prop_type |
| 625 | 625 | $field_count++; |
| 626 | | - $smw_array = $field->getObject('Property'); //this returns an array with property values filled |
| | 626 | + $smw_array = $field->getObject('semanticmediawiki_Property'); //this returns an array with property values filled |
| 627 | 627 | $prop_array = $smw_array['smw']; |
| 628 | 628 | if($prop_array != null){ |
| 629 | 629 | $title = Title::makeTitleSafe( SMW_NS_PROPERTY, $prop_array['name'] ); |
| — | — | @@ -641,7 +641,7 @@ |
| 642 | 642 | foreach ( $wgRequest->getValues() as $var => $val ) { |
| 643 | 643 | if(substr($var,0,18) == 'smw_property_name_'){ |
| 644 | 644 | $templateNum = substr($var,18,1); |
| 645 | | - $Xmltext .= '<semanticmediawiki:Property name="'.$val.'" >'; |
| | 645 | + $Xmltext .= '<semanticmediawiki_Property name="'.$val.'" >'; |
| 646 | 646 | }else if(substr($var,0,18) == 'smw_property_type_'){ |
| 647 | 647 | $Xmltext .= '<Type>'.$val.'</Type>'; |
| 648 | 648 | }else if(substr($var,0,11) == 'smw_values_'){ |
| — | — | @@ -657,7 +657,7 @@ |
| 658 | 658 | $Xmltext .= '<AllowedValue>'.$value.'</AllowedValue>'; |
| 659 | 659 | } |
| 660 | 660 | } |
| 661 | | - $Xmltext .= '</semanticmediawiki:Property>'; |
| | 661 | + $Xmltext .= '</semanticmediawiki_Property>'; |
| 662 | 662 | $xml_text_array[] = $Xmltext; |
| 663 | 663 | $Xmltext = ''; |
| 664 | 664 | } |
| — | — | @@ -676,7 +676,7 @@ |
| 677 | 677 | $field_count = 0; //counts the number of fields |
| 678 | 678 | foreach( $field_all as $field ) { //for each Field, retrieve smw properties and fill $prop_name , $prop_type |
| 679 | 679 | $field_count++; |
| 680 | | - $smw_array = $field->getObject('Property'); //this returns an array with property values filled |
| | 680 | + $smw_array = $field->getObject('semanticmediawiki_Property'); //this returns an array with property values filled |
| 681 | 681 | $prop_array = $smw_array['smw']; |
| 682 | 682 | if($prop_array != null){ |
| 683 | 683 | $html_text .= '<fieldset style="background: #DEF;"><legend>Property</legend>'; |
| — | — | @@ -731,7 +731,7 @@ |
| 732 | 732 | $field_count = 0; //counts the number of fields |
| 733 | 733 | foreach( $field_all as $field ) { //for each Field, retrieve smw properties and fill $prop_name , $prop_type |
| 734 | 734 | $field_count++; |
| 735 | | - $smw_array = $field->getObject('Property'); //this returns an array with property values filled |
| | 735 | + $smw_array = $field->getObject('semanticmediawiki_Property'); //this returns an array with property values filled |
| 736 | 736 | $prop_array = $smw_array['smw']; |
| 737 | 737 | if($prop_array != null){ |
| 738 | 738 | $title = Title::makeTitleSafe( SMW_NS_PROPERTY, $prop_array['name'] ); |
| — | — | @@ -786,7 +786,7 @@ |
| 787 | 787 | */ |
| 788 | 788 | function smwfCreatePageSchemasObject( $objectName, $xmlForField, &$object ) { |
| 789 | 789 | $smw_array = array(); |
| 790 | | - if ( $objectName == "Property" ) { |
| | 790 | + if ( $objectName == "semanticmediawiki_Property" ) { |
| 791 | 791 | foreach ( $xmlForField->children() as $tag => $child ) { |
| 792 | 792 | if ( $tag == $objectName ) { |
| 793 | 793 | $propName = $child->attributes()->name; |