Index: trunk/extensions/DidYouMean/DidYouMean.php |
— | — | @@ -95,16 +95,16 @@ |
96 | 96 | |
97 | 97 | # normalize entities and urlencoding to pure utf-8 |
98 | 98 | foreach ($sees as &$value) |
99 | | - $value = urldecode(html_entity_decode($value, ENT_QUOTES, 'UTF-8')); |
| 99 | + $value = rawurldecode(html_entity_decode($value, ENT_QUOTES, 'UTF-8')); |
100 | 100 | |
101 | | - wfDebug( 'HIPP: Parser: ' . utf8_decode(implode(', ', $sees)) . "\n" ); |
102 | | - wfDebug( 'HIPP: DBase: ' . utf8_decode(implode(', ', $parser->mDymSees)) . "\n" ); |
| 101 | + wfDebug( 'HIPP: Parser: ' . implode(', ', $sees) . "\n" ); |
| 102 | + wfDebug( 'HIPP: DBase: ' . implode(', ', $parser->mDymSees) . "\n" ); |
103 | 103 | |
104 | 104 | # add in the stuff from the database lookup |
105 | 105 | $sees = array_unique(array_merge($sees, $parser->mDymSees)); |
106 | 106 | sort($sees); |
107 | 107 | |
108 | | - wfDebug( 'HIPP: Merged: ' . utf8_decode(implode(', ', $sees)) . "\n" ); |
| 108 | + wfDebug( 'HIPP: Merged: ' . implode(', ', $sees) . "\n" ); |
109 | 109 | |
110 | 110 | # TODO is it better to use $parser->insertStripItem() ? |
111 | 111 | |
— | — | @@ -178,7 +178,7 @@ |
179 | 179 | # accumulate the db results |
180 | 180 | while( $o = $dbr->fetchObject( $res ) ) { |
181 | 181 | $t2 = str_replace('_', ' ', $o->page_title); |
182 | | - $dbo = utf8_decode($t2); |
| 182 | + $dbo = $t2; |
183 | 183 | if ($title != $t2) { |
184 | 184 | array_push( $sees, $t2 ); |
185 | 185 | $dbo = '++ ' . $dbo; |