diff --git a/code/CMSMain.php b/code/CMSMain.php index 03238ccb..6830ad53 100644 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -455,6 +455,9 @@ JS; return $this->returnItemToUser($p); } + /** + * @uses LeftAndMainDecorator->augmentNewSiteTreeItem() + */ public function getNewItem($id, $setID = true) { list($dummy, $className, $parentID, $suffix) = explode('-',$id); if(Translatable::is_enabled()) { diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index ef756e7d..bf7c9980 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -64,6 +64,10 @@ class LeftAndMain extends Controller { 'themedcss' => array(), ); + /** + * @uses LeftAndMainDecorator->init() + * @uses LeftAndMainDecorator->accessedCMS() + */ function init() { Director::set_site_mode('cms'); @@ -231,8 +235,12 @@ class LeftAndMain extends Controller { Requirements::customScript('Behaviour.addLoader(hideLoading);'); + // DEPRECATED 2.3: Use init() $dummy = null; $this->extend('augmentInit', $dummy); + + $dummy = null; + $this->extend('init', $dummy); } //------------------------------------------------------------------------------------------// diff --git a/code/LeftAndMainDecorator.php b/code/LeftAndMainDecorator.php new file mode 100644 index 00000000..811382c0 --- /dev/null +++ b/code/LeftAndMainDecorator.php @@ -0,0 +1,21 @@ + \ No newline at end of file