| Index: branches/wmf/1.16wmf4/includes/api/ApiLogin.php |
| — | — | @@ -89,8 +89,11 @@ |
| 90 | 90 | break; |
| 91 | 91 | |
| 92 | 92 | case LoginForm::NEED_TOKEN: |
| | 93 | + global $wgCookiePrefix; |
| 93 | 94 | $result['result'] = 'NeedToken'; |
| 94 | 95 | $result['token'] = $loginForm->getLoginToken(); |
| | 96 | + $result['cookieprefix'] = $wgCookiePrefix; |
| | 97 | + $result['sessionid'] = session_id(); |
| 95 | 98 | break; |
| 96 | 99 | |
| 97 | 100 | case LoginForm::WRONG_TOKEN: |
| Property changes on: branches/wmf/1.16wmf4/includes/api/ApiLogin.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 98 | 101 | Merged /branches/wmf-deployment/includes/api/ApiLogin.php:r53381,59952,60970 |
| 99 | 102 | Merged /branches/REL1_15/phase3/includes/api/ApiLogin.php:r51646 |
| 100 | 103 | Merged /branches/sqlite/includes/api/ApiLogin.php:r58211-58321 |
| 101 | 104 | Merged /trunk/phase3/includes/api/ApiLogin.php:r63549,63764,63897-63901,64454,64694,66486 |