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
Per siebrand and Nikerabbit (tweak for r47535):
[lhc/web/wiklou.git]
/
includes
/
WikiError.php
diff --git
a/includes/WikiError.php
b/includes/WikiError.php
index
ef8437f
..
251c174
100644
(file)
--- a/
includes/WikiError.php
+++ b/
includes/WikiError.php
@@
-16,32
+16,31
@@
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
- * 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA.
+ * 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* 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;
}
-
+
/**
* @return string Plaintext error message to display
*/
function getMessage() {
return $this->mMessage;
}
/**
* @return string Plaintext error message to display
*/
function getMessage() {
return $this->mMessage;
}
-
+
/**
* In following PEAR_Error model this could be formatted differently,
* but so far it's not.
/**
* In following PEAR_Error model this could be formatted differently,
* but so far it's not.
@@
-50,44
+49,56
@@
class WikiError {
function toString() {
return $this->getMessage();
}
function toString() {
return $this->getMessage();
}
-
+
/**
* 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
*/
*/
-
function isError( &
$object ) {
- return
is_a( $object, 'WikiError' )
;
+
public static function isError(
$object ) {
+ return
$object instanceof WikiError
;
}
}
/**
* Localized error message object
}
}
/**
* 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/*, ... */ ) {
$args = func_get_args();
array_shift( $args );
$this->mMessage = wfMsgReal( $message, $args, true );
* @param ... parameters to pass to wfMsg()
*/
function WikiErrorMsg( $message/*, ... */ ) {
$args = func_get_args();
array_shift( $args );
$this->mMessage = wfMsgReal( $message, $args, true );
+ $this->mMsgKey = $message;
+ $this->mMsgArgs = $args;
+ }
+
+ function getMessageKey() {
+ return $this->mMsgKey;
+ }
+
+ function getMessageArgs() {
+ return $this->mMsgArgs;
}
}
/**
}
}
/**
- * @package MediaWiki
- * @todo document
+ * Error class designed to handle errors involved with
+ * XML parsing
+ * @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 );
@@
-100,17
+111,17
@@
class WikiXmlError extends WikiError {
wfDebug( "WikiXmlError: " . $this->getMessage() . "\n" );
}
wfDebug( "WikiXmlError: " . $this->getMessage() . "\n" );
}
- /** @return string */
+ /** @return string */
function getMessage() {
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 ) );
}
-
+
function _extractContext( $context, $offset ) {
if( is_null( $context ) ) {
return null;
function _extractContext( $context, $offset ) {
if( is_null( $context ) ) {
return null;
@@
-121,5
+132,3
@@
class WikiXmlError extends WikiError {
}
}
}
}
}
}
-
-?>