From ae7f3a49c429be02f22c54f40c14d9b22a691d13 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Tue, 30 May 2017 13:37:11 +0100 Subject: [PATCH] Deprecate modules correction (#16362) * revert previous pr as these were the wrong files * deprecate the correct files this time --- .../components/com_modules/layouts/toolbar/cancelselect.php | 2 -- administrator/components/com_modules/models/select.php | 2 -- .../components/com_modules/views/positions/tmpl/modal.php | 2 ++ .../components/com_modules/views/positions/view.html.php | 2 ++ .../components/com_modules/views/select/tmpl/default.php | 2 -- administrator/components/com_modules/views/select/view.html.php | 2 -- 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/administrator/components/com_modules/layouts/toolbar/cancelselect.php b/administrator/components/com_modules/layouts/toolbar/cancelselect.php index 8e930f21daa9e..5687325d07c90 100644 --- a/administrator/components/com_modules/layouts/toolbar/cancelselect.php +++ b/administrator/components/com_modules/layouts/toolbar/cancelselect.php @@ -7,8 +7,6 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -// @deprecated 4.0 without replacement only used in hathor - defined('_JEXEC') or die; $text = JText::_('JTOOLBAR_CANCEL'); diff --git a/administrator/components/com_modules/models/select.php b/administrator/components/com_modules/models/select.php index a372bbbc33e93..277f7dc32b88a 100644 --- a/administrator/components/com_modules/models/select.php +++ b/administrator/components/com_modules/models/select.php @@ -7,8 +7,6 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -// @deprecated 4.0 without replacement only used in hathor - defined('_JEXEC') or die; use Joomla\Utilities\ArrayHelper; diff --git a/administrator/components/com_modules/views/positions/tmpl/modal.php b/administrator/components/com_modules/views/positions/tmpl/modal.php index 0c2fdb1209d83..d53c01aaaa252 100644 --- a/administrator/components/com_modules/views/positions/tmpl/modal.php +++ b/administrator/components/com_modules/views/positions/tmpl/modal.php @@ -7,6 +7,8 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +// @deprecated 4.0 without replacement only used in hathor + defined('_JEXEC') or die; JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); diff --git a/administrator/components/com_modules/views/positions/view.html.php b/administrator/components/com_modules/views/positions/view.html.php index 0bf9a4f545789..e1ec5c185b1f5 100644 --- a/administrator/components/com_modules/views/positions/view.html.php +++ b/administrator/components/com_modules/views/positions/view.html.php @@ -7,6 +7,8 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +// @deprecated 4.0 without replacement only used in hathor + defined('_JEXEC') or die; /** diff --git a/administrator/components/com_modules/views/select/tmpl/default.php b/administrator/components/com_modules/views/select/tmpl/default.php index 1acf236567932..bdf61d42a5500 100644 --- a/administrator/components/com_modules/views/select/tmpl/default.php +++ b/administrator/components/com_modules/views/select/tmpl/default.php @@ -7,8 +7,6 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -// @deprecated 4.0 without replacement only used in hathor - defined('_JEXEC') or die; JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); diff --git a/administrator/components/com_modules/views/select/view.html.php b/administrator/components/com_modules/views/select/view.html.php index 36e63ec4b36d3..93489fc147065 100644 --- a/administrator/components/com_modules/views/select/view.html.php +++ b/administrator/components/com_modules/views/select/view.html.php @@ -7,8 +7,6 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -// @deprecated 4.0 without replacement only used in hathor - defined('_JEXEC') or die; /**