| Index: trunk/extensions/Collection/Collection.php |
| — | — | @@ -143,8 +143,8 @@ |
| 144 | 144 | $collection = array(); |
| 145 | 145 | } |
| 146 | 146 | $r = new AjaxResponse( $json->encode( array( 'collection' => $collection ) ) ); |
| 147 | | - $r->setContentType( 'application/json' ); |
| 148 | | - return $r; |
| | 147 | + $r->setContentType( 'application/json' ); |
| | 148 | + return $r; |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | $wgAjaxExportList[] = 'wfAjaxGetCollection'; |
| — | — | @@ -157,8 +157,8 @@ |
| 158 | 158 | $collection = $json->decode( $collection ); |
| 159 | 159 | $_SESSION['wsCollection'] = $collection; |
| 160 | 160 | $r = new AjaxResponse( $json->encode( array( 'collection' => $collection ) ) ); |
| 161 | | - $r->setContentType( 'application/json' ); |
| 162 | | - return $r; |
| | 161 | + $r->setContentType( 'application/json' ); |
| | 162 | + return $r; |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | $wgAjaxExportList[] = 'wfAjaxPostCollection'; |
| — | — | @@ -169,15 +169,15 @@ |
| 170 | 170 | 'collection_id' => $collection_id, |
| 171 | 171 | 'writer' => $writer |
| 172 | 172 | ) ); |
| 173 | | - $r = new AjaxResponse( $json->encode( $result ) ); |
| 174 | | - $r->setContentType( 'application/json' ); |
| 175 | | - return $r; |
| | 173 | + $r = new AjaxResponse( $json->encode( $result ) ); |
| | 174 | + $r->setContentType( 'application/json' ); |
| | 175 | + return $r; |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | $wgAjaxExportList[] = 'wfAjaxGetMWServeStatus'; |
| 179 | 179 | |
| 180 | 180 | function wfAjaxCollectionAddArticle( $namespace=0, $title='', $oldid='' ) { |
| 181 | | - SpecialCollection::addArticleFromName( $namespace, $title, $oldid ); |
| | 181 | + SpecialCollection::addArticleFromName( $namespace, $title, $oldid ); |
| 182 | 182 | return ''; |
| 183 | 183 | } |
| 184 | 184 | |
| Index: trunk/extensions/Collection/Collection.hooks.php |
| — | — | @@ -210,12 +210,12 @@ |
| 211 | 211 | $addRemoveState = 'addpage'; |
| 212 | 212 | $action = 'add'; |
| 213 | 213 | $uaction = 'Add'; |
| 214 | | - $other_action = 'remove'; |
| | 214 | + $other_action = 'remove'; |
| 215 | 215 | } else { |
| 216 | 216 | $addRemoveState = 'removepage'; |
| 217 | 217 | $action = 'remove'; |
| 218 | 218 | $uaction = 'Remove'; |
| 219 | | - $other_action = 'add'; |
| | 219 | + $other_action = 'add'; |
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | $out .= Xml::tags( 'li', array( 'id' => "coll-{$action}_page" ), |
| — | — | @@ -272,7 +272,7 @@ |
| 273 | 273 | ), |
| 274 | 274 | "wgCollectionAddRemoveState = '$addRemoveState';" |
| 275 | 275 | ); |
| 276 | | - $out .= Xml::element( 'script', |
| | 276 | + $out .= Xml::element( 'script', |
| 277 | 277 | array( |
| 278 | 278 | 'type' => $wgJsMimeType, |
| 279 | 279 | 'src' => "$wgScriptPath/extensions/Collection/collection/portlet.js?$wgCollectionStyleVersion", |