| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -3052,7 +3052,7 @@ |
| 3053 | 3053 | $id = $this->mTitle->getArticleID( Title::GAID_FOR_UPDATE ); |
| 3054 | 3054 | |
| 3055 | 3055 | $error = ''; |
| 3056 | | - if ( $this->doDeleteArticle( $reason, $suppress, $id, &$error ) ) { |
| | 3056 | + if ( $this->doDeleteArticle( $reason, $suppress, $id, $error ) ) { |
| 3057 | 3057 | $deleted = $this->mTitle->getPrefixedText(); |
| 3058 | 3058 | |
| 3059 | 3059 | $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) ); |
| — | — | @@ -3099,7 +3099,7 @@ |
| 3100 | 3100 | * @param $commit boolean defaults to true, triggers transaction end |
| 3101 | 3101 | * @return boolean true if successful |
| 3102 | 3102 | */ |
| 3103 | | - public function doDeleteArticle( $reason, $suppress = false, $id = 0, $commit = true, $error='' ) { |
| | 3103 | + public function doDeleteArticle( $reason, $suppress = false, $id = 0, $commit = true, &$error='' ) { |
| 3104 | 3104 | global $wgDeferredUpdateList, $wgUseTrackbacks; |
| 3105 | 3105 | |
| 3106 | 3106 | wfDebug( __METHOD__ . "\n" ); |
| Index: trunk/phase3/includes/api/ApiDelete.php |
| — | — | @@ -147,7 +147,7 @@ |
| 148 | 148 | |
| 149 | 149 | $error = ''; |
| 150 | 150 | // Luckily, Article.php provides a reusable delete function that does the hard work for us |
| 151 | | - if ( $article->doDeleteArticle( $reason, false, 0, true, &$error ) ) { |
| | 151 | + if ( $article->doDeleteArticle( $reason, false, 0, true, $error ) ) { |
| 152 | 152 | return array(); |
| 153 | 153 | } else { |
| 154 | 154 | return array( array( 'cannotdelete', $article->mTitle->getPrefixedText() ) ); |