dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e1d42d5
)
use UtfNormal::cleanUp() (r55768)
author
ThomasV
<thomasv@users.mediawiki.org>
Sat, 5 Sep 2009 06:45:38 +0000
(06:45 +0000)
committer
ThomasV
<thomasv@users.mediawiki.org>
Sat, 5 Sep 2009 06:45:38 +0000
(06:45 +0000)
includes/DjVuImage.php
patch
|
blob
|
history
diff --git
a/includes/DjVuImage.php
b/includes/DjVuImage.php
index
942d194
..
544a455
100644
(file)
--- a/
includes/DjVuImage.php
+++ b/
includes/DjVuImage.php
@@
-251,9
+251,7
@@
class DjVuImage {
wfProfileOut( 'djvutxt' );
if( $retval == 0) {
# Get rid of invalid UTF-8, strip control characters
- wfSuppressWarnings();
- $txt = iconv( "UTF-8","UTF-8//IGNORE", $txt );
- wfRestoreWarnings();
+ $txt = UtfNormal::cleanUp( $txt );
$txt = preg_replace( "/[\013\035\037]/", "", $txt );
$txt = htmlspecialchars($txt);
$txt = preg_replace( "/\((page\s[\d-]*\s[\d-]*\s[\d-]*\s[\d-]*\s*\"([^<]*?)\"\s*|)\)/s", "<PAGE value=\"$2\" />", $txt );