In API action=login, make attribute sessionid work if a session ID doesn't exist...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0896f49..fd07d25 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -316,7 +316,8 @@ Full API documentation is available at http://www.mediawiki.org/wiki/API
 * Add rvtoken=rollback to prop=revisions
 * Add meta=allmessages to get messages from site's messages cache.
 * Use bold and italics highlighting only in API help
-* Added action={block,changerights,delete,move,protect,rollback,unblock,undelete} and list={blocks,deletedrevs}\
+* Added action={block,changerights,delete,move,protect,rollback,unblock,undelete} and list={blocks,deletedrevs}
+* Fixed sessionid attribute in action=login
 
 === Languages updated in 1.12 ===
 

diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index 7d78124..2a47d0a 100644 (file)
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -104,7 +104,7 @@ class ApiLogin extends ApiBase {
                                $result['lgusername'] = $_SESSION['wsUserName'];
                                $result['lgtoken'] = $_SESSION['wsToken'];
                                $result['cookieprefix'] = $wgCookiePrefix;
-                               $result['sessionid'] = $_COOKIE["{$wgCookiePrefix}_session"];
+                               $result['sessionid'] = session_id();
                                break;
 
                        case LoginForm :: NO_NAME :