From c395bfca6c172d35cddf893b173b45a3462f0fa6 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Sun, 16 Oct 2016 16:16:13 +0200 Subject: [PATCH] some cs changes after #12396 --- .../com_media/views/images/tmpl/default.php | 11 +++++------ .../components/com_media/views/media/tmpl/default.php | 11 +++++------ layouts/joomla/form/field/file.php | 6 +++--- libraries/joomla/utilities/utility.php | 2 +- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/administrator/components/com_media/views/images/tmpl/default.php b/administrator/components/com_media/views/images/tmpl/default.php index 02fecf1d89de2..05eb6cdd6b29b 100644 --- a/administrator/components/com_media/views/images/tmpl/default.php +++ b/administrator/components/com_media/views/images/tmpl/default.php @@ -175,12 +175,11 @@
-

config->get('upload_maxsize'); - $maxSize = JUtility::getMaxUploadSize($cMax . 'MB'); - - echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', JHtml::_('number.bytes', $maxSize)); - ?>

+

+ config->get('upload_maxsize'); ?> + + +

diff --git a/administrator/components/com_media/views/media/tmpl/default.php b/administrator/components/com_media/views/media/tmpl/default.php index b73162ac63be4..d7a0e60826968 100644 --- a/administrator/components/com_media/views/media/tmpl/default.php +++ b/administrator/components/com_media/views/media/tmpl/default.php @@ -88,12 +88,11 @@
-

config->get('upload_maxsize'); - $maxSize = JUtility::getMaxUploadSize($cMax . 'MB'); - - echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', JHtml::_('number.bytes', $maxSize)); - ?>

+

+ config->get('upload_maxsize'); ?> + + +

set('com_media.return_url', 'index.php?option=com_media'); ?> diff --git a/layouts/joomla/form/field/file.php b/layouts/joomla/form/field/file.php index 88b30e8a5ad27..0d3d8c93af853 100644 --- a/layouts/joomla/form/field/file.php +++ b/layouts/joomla/form/field/file.php @@ -48,6 +48,8 @@ // Including fallback code for HTML5 non supported browsers. JHtml::_('jquery.framework'); JHtml::_('script', 'system/html5fallback.js', false, true); + +$maxSize = JHtml::_('number.bytes', JUtility::getMaxUploadSize()); ?> />
- diff --git a/libraries/joomla/utilities/utility.php b/libraries/joomla/utilities/utility.php index be669584de7b7..cd8ca948158be 100644 --- a/libraries/joomla/utilities/utility.php +++ b/libraries/joomla/utilities/utility.php @@ -53,7 +53,7 @@ public static function parseAttributes($string) * * @return int Size in number of bytes * - * @since __DEPLOY_VERSION__ + * @since __DEPLOY_VERSION__ */ public static function getMaxUploadSize($custom = null) {