From 35bcf69c017f7b18407ec075cedcb7ee88e12754 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Thu, 15 Nov 2012 14:30:47 +1300 Subject: [PATCH 1/6] Removed deprecated Register::register() and unregister() Report automatically includes reports instead, and add_excluded_reports() can be used to exclude certain reports --- code/reports/Report.php | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/code/reports/Report.php b/code/reports/Report.php index 35fafadf..4a94569f 100644 --- a/code/reports/Report.php +++ b/code/reports/Report.php @@ -137,28 +137,6 @@ class SS_Report extends ViewableData { ); } - /** - * @deprecated 3.0 - * All subclasses of SS_Report now appear in the report admin, no need to register or unregister. - * - * Register a report. - * @param $list The list to add the report to: "ReportAdmin" or "SideReports" - * @param $reportClass The class of the report to add. - * @param $priority The priority. Higher numbers will appear furhter up in the reports list. - * The default value is zero. - */ - static public function register($list, $reportClass, $priority = 0) { - Deprecation::notice('3.0', 'All subclasses of SS_Report now appear in the report admin, no need to register'); - } - - /** - * @deprecated 3.0 - * All subclasses of SS_Report now appear in the report admin, no need to register or unregister. - */ - static public function unregister($list, $reportClass) { - self::add_excluded_reports($reportClass); - } - /** * Exclude certain reports classes from the list of Reports in the CMS * @param $reportClass Can be either a string with the report classname or an array of reports classnames From 555ecd7f24291222345e710fa09065f7e83d8f4e Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Thu, 15 Nov 2012 14:31:54 +1300 Subject: [PATCH 2/6] Removed deprecated SiteTreeDecorator, use SiteTreeExtension instead --- code/model/SiteTreeDecorator.php | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 code/model/SiteTreeDecorator.php diff --git a/code/model/SiteTreeDecorator.php b/code/model/SiteTreeDecorator.php deleted file mode 100644 index 18c6f3e2..00000000 --- a/code/model/SiteTreeDecorator.php +++ /dev/null @@ -1,14 +0,0 @@ - Date: Thu, 15 Nov 2012 14:32:21 +1300 Subject: [PATCH 3/6] Removed deprecated ContentController::LangAttributes() Use ContentLocale() instead and write attribute names suitable to XHTML/HTML instead --- code/controllers/ContentController.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/controllers/ContentController.php b/code/controllers/ContentController.php index c7756dd4..ac382833 100644 --- a/code/controllers/ContentController.php +++ b/code/controllers/ContentController.php @@ -340,18 +340,6 @@ HTML; } } - /** - * Returns the xml:lang and lang attributes. - * - * @deprecated 2.5 Use ContentLocale() instead and write attribute names suitable to XHTML/HTML - * templates directly in the template. - */ - public function LangAttributes() { - Deprecation::notice('2.5', 'Use ContentLocale() instead and write attribute names suitable to XHTML/HTML instead.'); - $locale = $this->ContentLocale(); - return "xml:lang=\"$locale\" lang=\"$locale\""; - } - /** * Returns an RFC1766 compliant locale string, e.g. 'fr-CA'. * Inspects the associated {@link dataRecord} for a {@link SiteTree->Locale} value if present, From 94b37dbeb0c1e4ee245f5667270b72f2b7f61405 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Thu, 15 Nov 2012 14:32:52 +1300 Subject: [PATCH 4/6] Fixing AssetAdmin to use static FormField::create_tag() Instead of createTag() which is deprecated --- code/controllers/AssetAdmin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php index 295f4aea..8d8d46f2 100644 --- a/code/controllers/AssetAdmin.php +++ b/code/controllers/AssetAdmin.php @@ -253,7 +253,7 @@ JS // TODO Replace with lazy loading on client to avoid performance hit of rendering potentially unused views new LiteralField( 'Tree', - $treeField->createTag( + FormField::create_tag( 'div', array( 'class' => 'cms-tree', From d236bb58eba96a95a30ddf0a1c6358b03e84261b Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Thu, 15 Nov 2012 14:39:48 +1300 Subject: [PATCH 5/6] Removed deprecated SiteTree::prepopuplate_permission_cache() This function is misspelled, and was marked deprecated. This commit removes that function. Please use prepopulate_permission_cache() instead (note the removal of the extraneous "p" in "prepopuplate") --- code/model/SiteTree.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php index e1b771a1..50ab173a 100644 --- a/code/model/SiteTree.php +++ b/code/model/SiteTree.php @@ -998,14 +998,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid return SiteConfig::current_site_config(); } - /** - * @deprecated 3.0 Use prepopulate_permission_cache() instead (without the extraneous "p" in "prepopulate") - */ - static public function prepopuplate_permission_cache($permission = 'CanEditType', $ids, $batchCallback = null) { - Deprecation::notice("3.0", "Use prepopulate_permission_cache instead."); - self::prepopulate_permission_cache($permission, $ids, $batchCallback); - } - /** * Pre-populate the cache of canEdit, canView, canDelete, canPublish permissions. * This method will use the static can_(perm)_multiple method for efficiency. From cef087f689b5d729db8af507e3bfc15b6e2191af Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Thu, 15 Nov 2012 14:41:17 +1300 Subject: [PATCH 6/6] Removed deprecated SiteTree::TreeTitle(), use getTreeTitle() instead --- code/model/SiteTree.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php index 50ab173a..1057ca74 100644 --- a/code/model/SiteTree.php +++ b/code/model/SiteTree.php @@ -2512,15 +2512,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid return $this->_cache_statusFlags; } - - /** - * @deprecated 3.0 Use getTreeTitle() - */ - public function TreeTitle() { - Deprecation::notice('3.0', 'Use getTreeTitle() instead.'); - return $this->getTreeTitle(); - } - /** * getTreeTitle will return three html DOM elements, an empty with * the class 'jstree-pageicon' in front, following by a wrapping around its