/**
* Edits or creates a page/revision
- * @param string $pageName page title
- * @param string $text content of the page
- * @param string $summary optional summary string for the revision
- * @param int $defaultNs optional namespace id
- * @return array Array as returned by WikiPage::doEditContent()
+ * @param string $pageName Page title
+ * @param string $text Content of the page
+ * @param string $summary Optional summary string for the revision
+ * @param int $defaultNs Optional namespace id
+ * @return Array as returned by WikiPage::doEditContent()
*/
protected function editPage( $pageName, $text, $summary = '', $defaultNs = NS_MAIN ) {
$title = Title::newFromText( $pageName, $defaultNs );
* requesting a "real" edit token.
*
* @param array $params Key-value API params
- * @param array|null $session session array
+ * @param array|null $session Session array
* @param User|null $user A User object for the context
- * @return mixed Result of the API call
- * @throws Exception in case wsToken is not set in the session
+ * @return Result of the API call
+ * @throws Exception In case wsToken is not set in the session
*/
protected function doApiRequestWithToken( array $params, array $session = null,
User $user = null
$session = $wgRequest->getSessionArray();
}
- if ( $session['wsToken'] ) {
+ if ( isset( $session['wsToken'] ) && $session['wsToken'] ) {
// add edit token to fake session
$session['wsEditToken'] = $session['wsToken'];
// add token to request parameters
return $this->doApiRequest( $params, $session, false, $user );
} else {
- throw new Exception( "request data not in right format" );
+ throw new Exception( "Session token not available" );
}
}
$data = $this->doApiRequest( array(
'action' => 'login',
- 'lgname' => self::$users[ $user ]->username,
- 'lgpassword' => self::$users[ $user ]->password ) );
+ 'lgname' => self::$users[$user]->username,
+ 'lgpassword' => self::$users[$user]->password ) );
$token = $data[0]['login']['token'];
array(
'action' => 'login',
'lgtoken' => $token,
- 'lgname' => self::$users[ $user ]->username,
- 'lgpassword' => self::$users[ $user ]->password,
+ 'lgname' => self::$users[$user]->username,
+ 'lgpassword' => self::$users[$user]->password,
),
$data[2]
);