dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
API: Go back to using the good old str_replace() hacks rather than Title methods...
[lhc/web/wiklou.git]
/
includes
/
WikiError.php
diff --git
a/includes/WikiError.php
b/includes/WikiError.php
index
6986b1c
..
c508200
100644
(file)
--- a/
includes/WikiError.php
+++ b/
includes/WikiError.php
@@
-19,19
+19,18
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
- * @package MediaWiki
*/
/**
* Since PHP4 doesn't have exceptions, here's some error objects
* loosely modeled on the standard PEAR_Error model...
*/
/**
* Since PHP4 doesn't have exceptions, here's some error objects
* loosely modeled on the standard PEAR_Error model...
- * @
package MediaWiki
+ * @
ingroup Exception
*/
class WikiError {
/**
*/
class WikiError {
/**
- * @param
string $message
+ * @param
$message string
*/
*/
- function
WikiError
( $message ) {
+ function
__construct
( $message ) {
$this->mMessage = $message;
}
$this->mMessage = $message;
}
@@
-55,22
+54,21
@@
class WikiError {
* Returns true if the given object is a WikiError-descended
* error object, false otherwise.
*
* Returns true if the given object is a WikiError-descended
* error object, false otherwise.
*
- * @param
mixed $object
+ * @param
$object mixed
* @return bool
* @return bool
- * @static
*/
*/
- public static function isError(
&
$object ) {
+ public static function isError( $object ) {
return $object instanceof WikiError;
}
}
/**
* Localized error message object
return $object instanceof WikiError;
}
}
/**
* Localized error message object
- * @
package MediaWiki
+ * @
ingroup Exception
*/
class WikiErrorMsg extends WikiError {
/**
*/
class WikiErrorMsg extends WikiError {
/**
- * @param
string $message W
iki message name
+ * @param
$message String: w
iki message name
* @param ... parameters to pass to wfMsg()
*/
function WikiErrorMsg( $message/*, ... */ ) {
* @param ... parameters to pass to wfMsg()
*/
function WikiErrorMsg( $message/*, ... */ ) {
@@
-81,13
+79,15
@@
class WikiErrorMsg extends WikiError {
}
/**
}
/**
- * @package MediaWiki
* @todo document
* @todo document
+ * @ingroup Exception
*/
class WikiXmlError extends WikiError {
/**
*/
class WikiXmlError extends WikiError {
/**
- * @param resource $parser
- * @param string $message
+ * @param $parser resource
+ * @param $message string
+ * @param $context
+ * @param $offset Int
*/
function WikiXmlError( $parser, $message = 'XML parsing error', $context = null, $offset = 0 ) {
$this->mXmlError = xml_get_error_code( $parser );
*/
function WikiXmlError( $parser, $message = 'XML parsing error', $context = null, $offset = 0 ) {
$this->mXmlError = xml_get_error_code( $parser );
@@
-102,12
+102,12
@@
class WikiXmlError extends WikiError {
/** @return string */
function getMessage() {
/** @return string */
function getMessage() {
- return sprintf( '%s at line %d, col %d (byte %d%s): %s',
+ // '$1 at line $2, col $3 (byte $4): $5',
+ return wfMsgHtml( 'xml-error-string',
$this->mMessage,
$this->mLine,
$this->mColumn,
$this->mMessage,
$this->mLine,
$this->mColumn,
- $this->mByte,
- $this->mContext,
+ $this->mByte . $this->mContext,
xml_error_string( $this->mXmlError ) );
}
xml_error_string( $this->mXmlError ) );
}
@@
-121,5
+121,3
@@
class WikiXmlError extends WikiError {
}
}
}
}
}
}
-
-?>