Index: trunk/phase3/includes/api/ApiLogin.php |
— | — | @@ -94,7 +94,7 @@ |
95 | 95 | $loginForm = new LoginForm($params); |
96 | 96 | switch ($loginForm->authenticateUserData()) { |
97 | 97 | case LoginForm :: SUCCESS : |
98 | | - global $wgUser; |
| 98 | + global $wgUser, $wgCookiePrefix; |
99 | 99 | |
100 | 100 | $wgUser->setOption('rememberpassword', 1); |
101 | 101 | $wgUser->setCookies(); |
— | — | @@ -103,6 +103,8 @@ |
104 | 104 | $result['lguserid'] = $_SESSION['wsUserID']; |
105 | 105 | $result['lgusername'] = $_SESSION['wsUserName']; |
106 | 106 | $result['lgtoken'] = $_SESSION['wsToken']; |
| 107 | + $result['cookieprefix'] = $wgCookiePrefix; |
| 108 | + $result['sessionid'] = $_COOKIE["{$wgCookiePrefix}_session"]; |
107 | 109 | break; |
108 | 110 | |
109 | 111 | case LoginForm :: NO_NAME : |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -110,6 +110,7 @@ |
111 | 111 | * Include svn revision number (if install is checked-out from svn) in siteinfo query. |
112 | 112 | * (bug 11173) Allow limited wikicode rendering via api.php |
113 | 113 | * (bug 11572) API should provide interface for expanding templates |
| 114 | +* (bug 11569) Login should return the cookie prefix |
114 | 115 | |
115 | 116 | === Languages updated in 1.12 === |
116 | 117 | |