dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fixed detection of unsigned mysql column in updater"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiEditPage.php
diff --git
a/includes/api/ApiEditPage.php
b/includes/api/ApiEditPage.php
index
f663cc6
..
15fa333
100644
(file)
--- a/
includes/api/ApiEditPage.php
+++ b/
includes/api/ApiEditPage.php
@@
-252,9
+252,10
@@
class ApiEditPage extends ApiBase {
'format' => $contentFormat,
'model' => $contentHandler->getModelID(),
'wpEditToken' => $params['token'],
'format' => $contentFormat,
'model' => $contentHandler->getModelID(),
'wpEditToken' => $params['token'],
- 'wpIgnoreBlankSummary' =>
''
,
+ 'wpIgnoreBlankSummary' =>
true
,
'wpIgnoreBlankArticle' => true,
'wpIgnoreSelfRedirect' => true,
'wpIgnoreBlankArticle' => true,
'wpIgnoreSelfRedirect' => true,
+ 'bot' => $params['bot'],
);
if ( !is_null( $params['summary'] ) ) {
);
if ( !is_null( $params['summary'] ) ) {
@@
-401,7
+402,7
@@
class ApiEditPage extends ApiBase {
$oldRequest = $wgRequest;
$wgRequest = $req;
$oldRequest = $wgRequest;
$wgRequest = $req;
- $status = $ep->
internalAttemptSave( $result, $user->isAllowed( 'bot' ) && $params['bot']
);
+ $status = $ep->
attemptSave( $result
);
$wgRequest = $oldRequest;
switch ( $status->value ) {
$wgRequest = $oldRequest;
switch ( $status->value ) {
@@
-462,7
+463,6
@@
class ApiEditPage extends ApiBase {
case EditPage::AS_CONFLICT_DETECTED:
$this->dieUsageMsg( 'editconflict' );
case EditPage::AS_CONFLICT_DETECTED:
$this->dieUsageMsg( 'editconflict' );
- // case EditPage::AS_SUMMARY_NEEDED: Can't happen since we set wpIgnoreBlankSummary
case EditPage::AS_TEXTBOX_EMPTY:
$this->dieUsageMsg( 'emptynewsection' );
case EditPage::AS_TEXTBOX_EMPTY:
$this->dieUsageMsg( 'emptynewsection' );
@@
-487,6
+487,7
@@
class ApiEditPage extends ApiBase {
break;
case EditPage::AS_SUMMARY_NEEDED:
break;
case EditPage::AS_SUMMARY_NEEDED:
+ // Shouldn't happen since we set wpIgnoreBlankSummary, but just in case
$this->dieUsageMsg( 'summaryrequired' );
case EditPage::AS_END:
$this->dieUsageMsg( 'summaryrequired' );
case EditPage::AS_END: