| Index: trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_Quantity.php |
| — | — | @@ -120,7 +120,7 @@ |
| 121 | 121 | if ( !is_null( $this->m_property ) ) { |
| 122 | 122 | $propertyDiWikiPage = $this->m_property->getDiWikiPage(); |
| 123 | 123 | } |
| 124 | | - if ( is_null( $this->m_property ) || is_null( $propertyDiWikiPag ) ) { |
| | 124 | + if ( is_null( $this->m_property ) || is_null( $propertyDiWikiPage ) ) { |
| 125 | 125 | return; // we cannot find conversion factors without the property |
| 126 | 126 | } |
| 127 | 127 | |
| Index: trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_WikiPage.php |
| — | — | @@ -145,10 +145,12 @@ |
| 146 | 146 | $this->m_fragment = $dataItem->getSubobjectName(); |
| 147 | 147 | $this->m_prefixedtext = ''; |
| 148 | 148 | $this->m_caption = false; // this class can handle this |
| | 149 | + |
| 149 | 150 | if ( ( $this->m_fixNamespace != NS_MAIN ) && |
| 150 | 151 | ( $this->m_fixNamespace != $dataItem->getNamespace() ) ) { |
| 151 | | - $this->addError( wfMsgForContent( 'smw_wrong_namespace', |
| 152 | | - $wgContLang->getNsText( $this->m_fixNamespace ) ) ); |
| | 152 | + global $wgContLang; |
| | 153 | + $this->addError( wfMsgForContent( 'smw_wrong_namespace', |
| | 154 | + $wgContLang->getNsText( $this->m_fixNamespace ) ) ); |
| 153 | 155 | } |
| 154 | 156 | return true; |
| 155 | 157 | } else { |