http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56436
Revision: 56436
Author: mkroetzsch
Date: 2009-09-16 20:24:06 +0000 (Wed, 16 Sep 2009)
Log Message:
-----------
fixed direct access to private member
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Linear.php
trunk/extensions/SemanticMediaWiki/includes/SMW_DV_NAry.php
trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Number.php
trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Time.php
trunk/extensions/SemanticMediaWiki/includes/SMW_DV_WikiPage.php
trunk/extensions/SemanticMediaWiki/includes/SMW_DataValue.php
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Linear.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Linear.php
2009-09-16 20:19:51 UTC (rev 56435)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Linear.php
2009-09-16 20:24:06 UTC (rev 56436)
@@ -167,7 +167,7 @@
// delete all previous errors, this is our real problem
/// TODO: probably we should check for this earlier,
but avoid unnecessary DB requests ...
wfLoadExtensionMessages('SemanticMediaWiki');
- $this->m_errors =
array(wfMsgForContent('smw_unknowntype',
SMWDataValueFactory::findTypeLabel($this->getTypeID())));
+ $this->addError(wfMsgForContent('smw_unknowntype',
SMWDataValueFactory::findTypeLabel($this->getTypeID())));
return;
}
$numdv = SMWDataValueFactory::newTypeIDValue('_num'); // used
for parsing the factors
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_NAry.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_NAry.php 2009-09-16
20:19:51 UTC (rev 56435)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_NAry.php 2009-09-16
20:24:06 UTC (rev 56436)
@@ -229,7 +229,7 @@
* NULL as an indication for omitted values.
*/
public function setDVs($datavalues) {
- $this->m_errors = array(); // clear errors
+ $this->clearErrors(); // clear errors
$this->m_infolinks = array(); // clear links
$this->m_hasssearchlink = false;
$this->m_caption = false;
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Number.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Number.php
2009-09-16 20:19:51 UTC (rev 56435)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Number.php
2009-09-16 20:24:06 UTC (rev 56436)
@@ -188,7 +188,7 @@
$this->convertToMainUnit();
return $this->m_value . $this->m_unit;
} else {
- return implode("\t", $this->m_errors);
+ return implode("\t", $this->getErrors());
}
}
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Time.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Time.php 2009-09-16
20:19:51 UTC (rev 56435)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Time.php 2009-09-16
20:24:06 UTC (rev 56436)
@@ -381,7 +381,7 @@
$this->createJD();
return strval($this->m_jd);
} else {
- return implode("\t", $this->m_errors);
+ return implode("\t", $this->getErrors());
}
}
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_WikiPage.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_WikiPage.php
2009-09-16 20:19:51 UTC (rev 56435)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_WikiPage.php
2009-09-16 20:24:06 UTC (rev 56436)
@@ -206,7 +206,7 @@
if ($this->isValid()) {
return $this->getPrefixedText();
} else {
- return implode("\t", $this->m_errors);
+ return implode("\t", $this->getErrors());
}
}
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DataValue.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DataValue.php
2009-09-16 20:19:51 UTC (rev 56435)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DataValue.php
2009-09-16 20:24:06 UTC (rev 56436)
@@ -233,6 +233,17 @@
}
}
+ /**
+ * Clear error messages. This function is provided temporarily to allow
+ * n-ary to do this. Eventually, n-ary should implement its setDBkeys()
+ * properly so that this function will vanish again.
+ * @note Do not use this function in external code.
+ */
+ protected function clearErrors() {
+ $this->m_errors = array();
+ $this->m_haserrors = false;
+ }
+
///// Abstract processing methods /////
/**
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
