tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #239 from halkyon/deprecation_cleanup

Browse Source 
Deprecation cleanup
This commit is contained in:
Stig Lindqvist 2012-11-14 18:57:47 -08:00
commit 8b561b7604
5 changed files with 1 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/AssetAdmin.php
View File

@ -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',

12
code/controllers/ContentController.php
View File

@ -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,

17
code/model/SiteTree.php
View File

@ -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.
@ -2520,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 <span> html DOM elements, an empty <span> with
* the class 'jstree-pageicon' in front, following by a <span> wrapping around its

14
code/model/SiteTreeDecorator.php
View File

@ -1,14 +0,0 @@
<?php
/**
* @package cms
* @subpackage model
* @deprecated 3.0 Use {@link SiteTreeExtension}.
*/
abstract class SiteTreeDecorator extends SiteTreeExtension {
public function __construct() {
Deprecation::notice('3.0', 'Use SiteTreeExtension instead.');
parent::__construct();
}
}

22
code/reports/Report.php
View File

@ -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