| Index: branches/wmf/1.16wmf4/includes/api/ApiLogin.php |
| — | — | @@ -85,6 +85,7 @@ |
| 86 | 86 | $result['lgusername'] = $wgUser->getName(); |
| 87 | 87 | $result['lgtoken'] = $wgUser->getToken(); |
| 88 | 88 | $result['cookieprefix'] = $wgCookiePrefix; |
| | 89 | + $result['sessionid'] = session_id(); |
| 89 | 90 | break; |
| 90 | 91 | |
| 91 | 92 | case LoginForm::NEED_TOKEN: |
| — | — | @@ -92,6 +93,7 @@ |
| 93 | 94 | $result['result'] = 'NeedToken'; |
| 94 | 95 | $result['token'] = $loginForm->getLoginToken(); |
| 95 | 96 | $result['cookieprefix'] = $wgCookiePrefix; |
| | 97 | + $result['sessionid'] = session_id(); |
| 96 | 98 | break; |
| 97 | 99 | |
| 98 | 100 | case LoginForm::WRONG_TOKEN: |
| Property changes on: branches/wmf/1.16wmf4/includes/api/ApiLogin.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 99 | 101 | Reverse-merged /trunk/phase3/includes/api/ApiLogin.php:r76077 |