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
Merge "Resolve successful 1-chunk uploads"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiErrorFormatter.php
diff --git
a/includes/api/ApiErrorFormatter.php
b/includes/api/ApiErrorFormatter.php
index
c52b731
..
7fb1352
100644
(file)
--- a/
includes/api/ApiErrorFormatter.php
+++ b/
includes/api/ApiErrorFormatter.php
@@
-176,7
+176,8
@@
class ApiErrorFormatter {
} else {
$msg = new RawMessage( '$1' );
if ( !isset( $options['code'] ) ) {
} else {
$msg = new RawMessage( '$1' );
if ( !isset( $options['code'] ) ) {
- $options['code'] = 'internal_api_error_' . get_class( $exception );
+ $class = preg_replace( '#^Wikimedia\\\Rdbms\\\#', '', get_class( $exception ) );
+ $options['code'] = 'internal_api_error_' . $class;
}
}
$params = [ wfEscapeWikiText( $exception->getMessage() ) ];
}
}
$params = [ wfEscapeWikiText( $exception->getMessage() ) ];
@@
-253,7
+254,7
@@
class ApiErrorFormatter {
$ret = preg_replace( '!</?(var|kbd|samp|code)>!', '"', $text );
// Strip tags and decode.
$ret = preg_replace( '!</?(var|kbd|samp|code)>!', '"', $text );
// Strip tags and decode.
- $ret =
html_entity_decode( strip_tags( $ret ), ENT_QUOTES | ENT_HTML5
);
+ $ret =
Sanitizer::stripAllTags( $ret
);
return $ret;
}
return $ret;
}