PleaseStand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86349
Change subject: Remove calls to wfDebugDieBacktrace
......................................................................
Remove calls to wfDebugDieBacktrace
Deprecated in I12336983e29524a450fc61ed9df4d840066be9b6.
Change-Id: Ie0271de755a63fcda8a3671cc115af7bc931a02b
---
M Cite.i18n.php
M Cite_body.php
2 files changed, 2 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite
refs/changes/49/86349/1
diff --git a/Cite.i18n.php b/Cite.i18n.php
index 6116074..8c193c4 100644
--- a/Cite.i18n.php
+++ b/Cite.i18n.php
@@ -13,16 +13,6 @@
/*
Debug and errors
*/
- # Internal errors
- 'cite_croak' => 'Cite died; $1: $2',
- 'cite_error_key_str_invalid' => 'Internal error;
-invalid $str and/or $key.
-This should never occur.',
- 'cite_error_stack_invalid_input' => 'Internal error;
-invalid stack key.
-This should never occur.',
-
- # User errors
'cite_error' => 'Cite error: $1',
'cite_error_ref_numeric_key' => 'Invalid
<code><ref></code> tag;
name cannot be a simple integer. Use a descriptive title',
diff --git a/Cite_body.php b/Cite_body.php
index 1baec2c..a7c6a4d 100644
--- a/Cite_body.php
+++ b/Cite_body.php
@@ -289,7 +289,7 @@
# Not clear how we could get here, but something is probably
# wrong with the types. Let's fail fast.
- $this->croak( 'cite_error_key_str_invalid', serialize( "$str;
$key" ) );
+ throw new MWException( 'Invalid $str and/or $key' );
}
/**
@@ -443,7 +443,7 @@
);
}
} else {
- $this->croak( 'cite_error_stack_invalid_input',
serialize( array( $key, $str ) ) );
+ throw new MWException( 'Invalid stack key' );
}
}
@@ -1179,18 +1179,6 @@
$ret = $this->parse( $ret );
}
return $ret;
- }
-
- /**
- * Die with a backtrace if something happens in the code which
- * shouldn't have
- *
- * @param int $error ID for the error
- * @param string $data Serialized error data
- */
- function croak( $error, $data ) {
- wfDebugDieBacktrace( wfMessage( 'cite_croak', $this->error(
$error ), $data )
- ->inContentLanguage()->text() );
}
/**#@-*/
--
To view, visit https://gerrit.wikimedia.org/r/86349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0271de755a63fcda8a3671cc115af7bc931a02b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: PleaseStand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
