| Index: trunk/extensions/Collection/Collection.hooks.php |
| — | — | @@ -194,13 +194,13 @@ |
| 195 | 195 | array( 'onclick' => "collectionCall('AddCategory', ['addcategory', wgTitle]); return false;", |
| 196 | 196 | 'rel' => 'nofollow', |
| 197 | 197 | 'title' => wfMsg( "coll-add_category_tooltip" ), ), |
| 198 | | - array( 'cattitle' => $wgTitle->getPartialURL() ), |
| 199 | | - array( 'known', 'noclasses', 'noescape' ) |
| | 198 | + array( 'cattitle' => urldecode( $wgTitle->getPartialURL() ) ), |
| | 199 | + array( 'known', 'noclasses' ) |
| 200 | 200 | ) |
| 201 | 201 | ); |
| 202 | 202 | |
| 203 | 203 | } else if( $ajaxHint || in_array( $namespace, $wgCollectionArticleNamespaces ) ) { |
| 204 | | - $params = array( 'arttitle' => $wgTitle->getPrefixedUrl() ); |
| | 204 | + $params = array( 'arttitle' => urldecode( $wgTitle->getPrefixedUrl() ) ); |
| 205 | 205 | if ( !is_null( $wgArticle ) ) { |
| 206 | 206 | $oldid = $wgArticle->getOldID(); |
| 207 | 207 | $params['oldid'] = $oldid; |
| Index: trunk/extensions/Collection/Collection.body.php |
| — | — | @@ -55,7 +55,7 @@ |
| 56 | 56 | self::limitExceeded(); |
| 57 | 57 | return; |
| 58 | 58 | } |
| 59 | | - $title_url = urldecode( $wgRequest->getVal( 'arttitle', '' ) ); |
| | 59 | + $title_url = $wgRequest->getVal( 'arttitle', '' ); |
| 60 | 60 | $oldid = $wgRequest->getInt( 'oldid', 0 ); |
| 61 | 61 | $title = Title::newFromURL( $title_url ); |
| 62 | 62 | $this->addArticle( $title, $oldid ); |
| — | — | @@ -68,7 +68,7 @@ |
| 69 | 69 | $wgOut->redirect( $redirectURL ); |
| 70 | 70 | return; |
| 71 | 71 | case 'remove_article/': |
| 72 | | - $title_url = urldecode( $wgRequest->getVal( 'arttitle', '' ) ); |
| | 72 | + $title_url = $wgRequest->getVal( 'arttitle', '' ); |
| 73 | 73 | $oldid = $wgRequest->getInt( 'oldid', 0 ); |
| 74 | 74 | $title = Title::newFromURL( $title_url ); |
| 75 | 75 | self::removeArticle( $title, $oldid ); |
| — | — | @@ -96,7 +96,7 @@ |
| 97 | 97 | $wgOut->redirect( SkinTemplate::makeSpecialUrl( 'Book' ) ); |
| 98 | 98 | return; |
| 99 | 99 | case 'add_category/': |
| 100 | | - $title = Title::makeTitleSafe( NS_CATEGORY, urldecode( $wgRequest->getVal( 'cattitle', '' ) ) ); |
| | 100 | + $title = Title::makeTitleSafe( NS_CATEGORY, $wgRequest->getVal( 'cattitle', '' ) ); |
| 101 | 101 | if ( self::addCategory( $title ) ) { |
| 102 | 102 | self::limitExceeded(); |
| 103 | 103 | return; |
| — | — | @@ -116,7 +116,7 @@ |
| 117 | 117 | $wgOut->redirect( SkinTemplate::makeSpecialUrl( 'Book' ) ); |
| 118 | 118 | return; |
| 119 | 119 | case 'load_collection/': |
| 120 | | - $title = Title::newFromText( urldecode( $wgRequest->getVal( 'colltitle', '' ) ) ); |
| | 120 | + $title = Title::newFromText( $wgRequest->getVal( 'colltitle', '' ) ); |
| 121 | 121 | if ( $wgRequest->getVal( 'cancel' ) ) { |
| 122 | 122 | $wgOut->redirect( $title->getFullURL() ); |
| 123 | 123 | return; |
| — | — | @@ -135,12 +135,12 @@ |
| 136 | 136 | $this->renderLoadOverwritePage( $title ); |
| 137 | 137 | return; |
| 138 | 138 | case 'order_collection/': |
| 139 | | - $title = Title::newFromText( urldecode( $wgRequest->getVal( 'colltitle', '' ) ) ); |
| | 139 | + $title = Title::newFromText( $wgRequest->getVal( 'colltitle', '' ) ); |
| 140 | 140 | $collection = $this->loadCollection( $title ); |
| 141 | 141 | $partner = $wgRequest->getVal( 'partner', 'pediapress' ); |
| 142 | 142 | return $this->postZIP( $collection, $partner ); |
| 143 | 143 | case 'save_collection/': |
| 144 | | - $collTitle = urldecode( $wgRequest->getVal( 'colltitle' ) ); |
| | 144 | + $collTitle = $wgRequest->getVal( 'colltitle' ); |
| 145 | 145 | if ( $wgRequest->getVal( 'overwrite' ) && !empty( $collTitle ) ) {; |
| 146 | 146 | $title = Title::newFromText( $collTitle ); |
| 147 | 147 | $this->saveCollection( $title, $overwrite=true ); |
| — | — | @@ -152,14 +152,14 @@ |
| 153 | 153 | $saveCalled = false; |
| 154 | 154 | if ( $collType == 'personal' ) { |
| 155 | 155 | $userPageTitle = $wgUser->getUserPage()->getPrefixedText(); |
| 156 | | - $name = urldecode( $wgRequest->getVal( 'pcollname', '' ) ); |
| | 156 | + $name = $wgRequest->getVal( 'pcollname', '' ); |
| 157 | 157 | if ( !empty( $name ) ) { |
| 158 | 158 | $title = Title::newFromText( $userPageTitle . '/' . wfMsgForContent( 'coll-collections' ) . '/' . $name ); |
| 159 | 159 | $saveCalled = true; |
| 160 | 160 | $saved = $this->saveCollection( $title, $overwrite ); |
| 161 | 161 | } |
| 162 | 162 | } else if ( $collType == 'community' ) { |
| 163 | | - $name = urldecode( $wgRequest->getVal( 'ccollname', '' ) ); |
| | 163 | + $name = $wgRequest->getVal( 'ccollname', '' ); |
| 164 | 164 | if ( !empty( $name ) ) { |
| 165 | 165 | $title = Title::makeTitle( $wgCommunityCollectionNamespace, wfMsgForContent( 'coll-collections' ) . '/' . $name ); |
| 166 | 166 | $saveCalled = true; |
| — | — | @@ -188,11 +188,11 @@ |
| 189 | 189 | case 'download/': |
| 190 | 190 | return $this->download(); |
| 191 | 191 | case 'render_article/': |
| 192 | | - $title = Title::newFromText( urldecode( $wgRequest->getVal( 'arttitle', '' ) ) ); |
| | 192 | + $title = Title::newFromText( $wgRequest->getVal( 'arttitle', '' ) ); |
| 193 | 193 | $oldid = $wgRequest->getInt( 'oldid', 0 ); |
| 194 | 194 | return $this->renderArticle( $title, $oldid, $wgRequest->getVal( 'writer', 'rl' ) ); |
| 195 | 195 | case 'render_collection/': |
| 196 | | - $title = Title::newFromText( urldecode( $wgRequest->getVal( 'colltitle', '' ) )); |
| | 196 | + $title = Title::newFromText( $wgRequest->getVal( 'colltitle', '' )); |
| 197 | 197 | $collection = $this->loadCollection( $title ); |
| 198 | 198 | if ( $collection ) { |
| 199 | 199 | $this->renderCollection( $collection, $title, $wgRequest->getVal( 'writer', 'rl' ) ); |