| Index: branches/wmf/1.18wmf1/extensions/CentralAuth/CentralAuthPlugin.php |
| — | — | @@ -251,21 +251,5 @@ |
| 252 | 252 | public function getUserInstance( User &$user ) { |
| 253 | 253 | return CentralAuthUser::getInstance( $user ); |
| 254 | 254 | } |
| 255 | | - |
| 256 | | - public function modifyUITemplate( &$template, &$type ) { |
| 257 | | - global $wgCentralAuthCookies; |
| 258 | 255 | |
| 259 | | - $template->set( 'usedomain', false ); |
| 260 | | - |
| 261 | | - if ( !$wgCentralAuthCookies ) return; |
| 262 | | - |
| 263 | | - $label = Xml::checkLabel( wfMsg( 'centralauth-login-global' ), 'wpCentralLogin', 'wpCentralLogin', true, array( 'tabindex' => '4' ) ); |
| 264 | | - $field = <<<HTML |
| 265 | | - <tr id="mw-centralauth-login"> |
| 266 | | - <td></td> |
| 267 | | - <td class="mw-input">$label</td> |
| 268 | | - </tr> |
| 269 | | -HTML; |
| 270 | | - $template->set( 'extrafields', $field ); |
| 271 | | - } |
| 272 | 256 | } |
| Index: branches/wmf/1.18wmf1/extensions/CentralAuth/CentralAuthHooks.php |
| — | — | @@ -125,7 +125,7 @@ |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | static function onUserLoginComplete( &$user, &$inject_html ) { |
| 129 | | - global $wgCentralAuthCookies, $wgRequest; |
| | 129 | + global $wgCentralAuthCookies; |
| 130 | 130 | if ( !$wgCentralAuthCookies ) { |
| 131 | 131 | // Use local sessions only. |
| 132 | 132 | return true; |
| — | — | @@ -144,11 +144,6 @@ |
| 145 | 145 | return true; |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | | - if ( !$wgRequest->getCheck( 'wpCentralLogin' ) ) { |
| 149 | | - // The user requested to log in just on this wiki |
| 150 | | - return true; |
| 151 | | - } |
| 152 | | - |
| 153 | 148 | $inject_html .= '<div class="centralauth-login-box"><p>' . |
| 154 | 149 | wfMsgExt( 'centralauth-login-progress', array( 'parsemag' ), $user->getName() ) . "</p>\n<p>"; |
| 155 | 150 | foreach ( $wgCentralAuthAutoLoginWikis as $alt => $wiki ) { |
| Index: branches/wmf/1.18wmf1/extensions/CentralAuth/CentralAuth.i18n.php |
| — | — | @@ -35,7 +35,6 @@ |
| 36 | 36 | 'centralauth-merge-step2-detail' => "Some of the accounts could not be automatically matched to the designated home wiki. |
| 37 | 37 | If these accounts belong to you, you can confirm that they are yours by providing the password for them.", |
| 38 | 38 | 'centralauth-merge-step2-submit' => 'Confirm login information', |
| 39 | | - 'centralauth-login-global' => 'Also log me in to other wikis of {{int:Centralauth-groupname}}', |
| 40 | 39 | |
| 41 | 40 | // Dry run messages |
| 42 | 41 | 'centralauth-merge-dryrun-complete' => 'All existing accounts can be automatically unified! |
| Property changes on: branches/wmf/1.18wmf1/extensions/CentralAuth |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 43 | 42 | Merged /trunk/extensions/CentralAuth:r106839 |