X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiDelete.php;h=0e13d705ff76c6618bd0cc1e7b77da0e30536628;hb=529fc12d2ad2032337594389448fdb5b55802830;hp=ec857b7da968ec694e095640d1d1e386e0054a27;hpb=216865344b108082f9500b5eb8cd5efeaa7df72f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index ec857b7da9..0e13d705ff 100644
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -75,9 +75,10 @@ class ApiDelete extends ApiBase {
 			$status = self::delete( $pageObj, $user, $reason, $params['tags'] );
 		}
 
-		if ( !$status->isGood() ) {
+		if ( !$status->isOK() ) {
 			$this->dieStatus( $status );
 		}
+		$this->addMessagesFromStatus( $status, [ 'warning' ], [ 'delete-scheduled' ] );
 
 		// Deprecated parameters
 		if ( $params['watch'] ) {
@@ -92,8 +93,14 @@ class ApiDelete extends ApiBase {
 		$r = [
 			'title' => $titleObj->getPrefixedText(),
 			'reason' => $reason,
-			'logid' => $status->value
 		];
+		if ( $status->hasMessage( 'delete-scheduled' ) ) {
+			$r['scheduled'] = true;
+		}
+		if ( $status->value !== null ) {
+			// Scheduled deletions don't currently have a log entry available at this point
+			$r['logid'] = $status->value;
+		}
 		$this->getResult()->addValue( null, $this->getModuleName(), $r );
 	}