From 252f7399192177dad8e7c5c11b5d705799fc3e1a Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 16 Oct 2008 11:05:57 +0000 Subject: [PATCH] API CHANGE Removed deprecated File->setMaxFileSize(), use Upload class API CHANGE Removed deprecated File->getMaxFileSize(), use Upload class API CHANGE Removed File::sync(), use Filesystem::sync() API CHANGE Removed deprecated File::fixfiles() API CHANGE Removed deprecated File::loadContent(), use Upload class API CHANGE Removed deprecated File::loadallcontent(), use Upload class git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64402 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- filesystem/File.php | 69 +------------------------------------------ filesystem/Folder.php | 6 ---- 2 files changed, 1 insertion(+), 74 deletions(-) diff --git a/filesystem/File.php b/filesystem/File.php index 1ccf8ba83..edf44308d 100755 --- a/filesystem/File.php +++ b/filesystem/File.php @@ -530,73 +530,6 @@ class File extends DataObject { self::$cache_file_fields = null; } - - - - - - - - - - /** - * DEPRECATED - */ - static $file_size_restrictions = array(); - - /** - * DEPRECATED - */ - static $allowed_file_types = array(); - - /** - * DEPRECATED - */ - static function setMaxFileSize( $maxSize, $warningSize, $extension = '*' ) { - user_error('File::setMaxFileSize is deprecated',E_USER_ERROR); - } - - /** - * DEPRECATED - */ - static function getMaxFileSize($extension = '*') { - user_error('File::getMaxFileSize is deprecated',E_USER_ERROR); - } - - /** - * DEPRECATED - */ - static function sync() { - user_error('File::sync is deprecated - please use FileSystem::sync',E_USER_ERROR); - } - - /** - * DEPRECATED - */ - function moverootfilesto() { - user_error('File::moverootfilesto is deprecated - please use FileSystem::moverootfilesto',E_USER_ERROR); - } - - /** - * DEPRECATED - */ - function fixfiles() { - user_error('File::fixfiles is deprecated - please use FileSystem::fixfiles',E_USER_ERROR); - } - -/** - * DEPRECATED - */ - function loadContent() { - user_error('File::loadContent deprecated',E_USER_ERROR); - } - - /** - * DEPRECATED - */ - public function loadallcontent() { - user_error('File::loadallcontent deprecated',E_USER_ERROR); - } } -?> +?> \ No newline at end of file diff --git a/filesystem/Folder.php b/filesystem/Folder.php index a16ea25e8..6ac95981c 100755 --- a/filesystem/Folder.php +++ b/filesystem/Folder.php @@ -490,12 +490,6 @@ class Folder extends File { HTML; } - /** - * Since this is a folder, we don't have any content as such. - */ - function loadContent() { - return; - } }