* Disabled "bug 2702" HTML tidying of parsed UI messages on wikis where Tidy is
disabled.
* DifferenceEngine::generateDiffBody() was removed (deprecated since 1.21).
+* UploadBase::stashFileGetKey() and UploadBase::stashSession() were deprecated.
+ Use ...->stashFile()->getFileKey() instead.
== Compatibility ==
* @param string $message HTML message to be passed to mainUploadForm
*/
protected function showRecoverableUploadError( $message ) {
- $sessionKey = $this->mUpload->stashSession();
+ $sessionKey = $this->mUpload->stashFile()->getFileKey();
$message = '<h2>' . $this->msg( 'uploaderror' )->escaped() . "</h2>\n" .
'<div class="error">' . $message . "</div>\n";
return false;
}
- $sessionKey = $this->mUpload->stashSession();
+ $sessionKey = $this->mUpload->stashFile()->getFileKey();
// Add styles for the warning, reused from the live preview
$this->getOutput()->addModuleStyles( 'mediawiki.special.upload.styles' );
* @return UploadStashFile Stashed file
*/
public function stashFile( User $user = null ) {
- // was stashSessionFile
-
$stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash( $user );
$file = $stash->stashFile( $this->mTempPath, $this->getSourceType() );
$this->mLocalFile = $file;
* Stash a file in a temporary directory, returning a key which can be used
* to find the file again. See stashFile().
*
+ * @deprecated since 1.28
* @return string File key
*/
public function stashFileGetKey() {
+ wfDeprecated( __METHOD__, '1.28' );
return $this->stashFile()->getFileKey();
}
/**
* alias for stashFileGetKey, for backwards compatibility
*
+ * @deprecated since 1.28
* @return string File key
*/
public function stashSession() {
- return $this->stashFileGetKey();
+ wfDeprecated( __METHOD__, '1.28' );
+ return $this->stashFile()->getFileKey();
}
/**
return $this->mLocalFile;
}
- /**
- * This should return the key instead of the UploadStashFile instance, for backward compatibility.
- * @return string
- */
- public function stashSession() {
- return $this->stashFile()->getFileKey();
- }
-
/**
* Remove a temporarily kept file stashed by saveTempUploadedFile().
* @return bool Success