diff --git a/administrator/components/com_banners/models/fields/clicks.php b/administrator/components/com_banners/models/fields/clicks.php index 73aefd73f1fc5..b0aa0083c777d 100644 --- a/administrator/components/com_banners/models/fields/clicks.php +++ b/administrator/components/com_banners/models/fields/clicks.php @@ -37,7 +37,7 @@ protected function getInput() return ' ' + . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly" /> ' . JText::_('COM_BANNERS_RESET_CLICKS') . ''; } } diff --git a/administrator/components/com_banners/models/fields/impmade.php b/administrator/components/com_banners/models/fields/impmade.php index 38fcafdea8a34..a45d38f8bfb19 100644 --- a/administrator/components/com_banners/models/fields/impmade.php +++ b/administrator/components/com_banners/models/fields/impmade.php @@ -37,7 +37,7 @@ protected function getInput() return ' ' + . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly" /> ' . JText::_('COM_BANNERS_RESET_IMPMADE') . ''; } } diff --git a/administrator/components/com_banners/views/banners/tmpl/default.php b/administrator/components/com_banners/views/banners/tmpl/default.php index d762dd1b724d7..5d36ed3091e12 100644 --- a/administrator/components/com_banners/views/banners/tmpl/default.php +++ b/administrator/components/com_banners/views/banners/tmpl/default.php @@ -110,7 +110,7 @@ } ?> - + id . '" class="btn hasTooltip" role="button" data-toggle="modal"' . ' title="' . JHtml::tooltipText('COM_CATEGORIES_CHANGE_CATEGORY') . '">' - . ' ' . JText::_('JSELECT') + . ' ' . JText::_('JSELECT') . ''; // Edit category button diff --git a/administrator/components/com_categories/views/categories/tmpl/default.php b/administrator/components/com_categories/views/categories/tmpl/default.php index c5a3bde2b2d56..e2ab1f0689a74 100644 --- a/administrator/components/com_categories/views/categories/tmpl/default.php +++ b/administrator/components/com_categories/views/categories/tmpl/default.php @@ -133,7 +133,7 @@ } ?> - + diff --git a/administrator/components/com_checkin/views/checkin/tmpl/default.php b/administrator/components/com_checkin/views/checkin/tmpl/default.php index a4797963a40e6..ba34b4b597bec 100644 --- a/administrator/components/com_checkin/views/checkin/tmpl/default.php +++ b/administrator/components/com_checkin/views/checkin/tmpl/default.php @@ -25,9 +25,9 @@
+ +
diff --git a/administrator/components/com_contact/helpers/html/contact.php b/administrator/components/com_contact/helpers/html/contact.php index 09e7e17e7512c..38e37791ed239 100644 --- a/administrator/components/com_contact/helpers/html/contact.php +++ b/administrator/components/com_contact/helpers/html/contact.php @@ -124,13 +124,13 @@ public static function featured($value = 0, $i, $canChange = true) if ($canChange) { - $html = ''; + $html = ''; } else { - $html = ''; + $html = ''; } return $html; diff --git a/administrator/components/com_contact/models/fields/modal/contact.php b/administrator/components/com_contact/models/fields/modal/contact.php index d6be9fe1cfe92..209e8ec03c720 100644 --- a/administrator/components/com_contact/models/fields/modal/contact.php +++ b/administrator/components/com_contact/models/fields/modal/contact.php @@ -143,7 +143,7 @@ protected function getInput() $html[] = ''; $html[] = '' - . ' ' . JText::_('JSELECT') + . ' ' . JText::_('JSELECT') . ''; $html[] = JHtmlBootstrap::renderModal( diff --git a/administrator/components/com_contact/views/contacts/tmpl/default.php b/administrator/components/com_contact/views/contacts/tmpl/default.php index 9f6d27a450005..a665b3f5e6be4 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/default.php +++ b/administrator/components/com_contact/views/contacts/tmpl/default.php @@ -68,8 +68,8 @@
- - + +
@@ -101,7 +101,7 @@ - ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> @@ -161,7 +161,7 @@ } ?> - +
+ +
diff --git a/administrator/components/com_content/helpers/html/contentadministrator.php b/administrator/components/com_content/helpers/html/contentadministrator.php index d66532b92c438..0c2335de81ed2 100644 --- a/administrator/components/com_content/helpers/html/contentadministrator.php +++ b/administrator/components/com_content/helpers/html/contentadministrator.php @@ -109,13 +109,13 @@ public static function featured($value = 0, $i, $canChange = true) if ($canChange) { - $html = ''; + $html = ''; } else { - $html = ''; + $html = ''; } return $html; diff --git a/administrator/components/com_content/models/fields/modal/article.php b/administrator/components/com_content/models/fields/modal/article.php index e2e6ec62af8e1..4071750fab21c 100644 --- a/administrator/components/com_content/models/fields/modal/article.php +++ b/administrator/components/com_content/models/fields/modal/article.php @@ -138,8 +138,8 @@ protected function getInput() $html[] = ''; $html[] = ''; $html[] = ' - ' + . JHtml::tooltipText('COM_CONTENT_CHANGE_ARTICLE') . '">' + . ' ' . JText::_('JSELECT') . ''; // Edit article button diff --git a/administrator/components/com_content/views/articles/tmpl/default.php b/administrator/components/com_content/views/articles/tmpl/default.php index 1ae18a95edd94..f6d91479dd984 100644 --- a/administrator/components/com_content/views/articles/tmpl/default.php +++ b/administrator/components/com_content/views/articles/tmpl/default.php @@ -123,7 +123,7 @@ } ?> - + diff --git a/administrator/components/com_contenthistory/views/compare/tmpl/compare.php b/administrator/components/com_contenthistory/views/compare/tmpl/compare.php index 374316f2ff2a8..a83d22c300313 100644 --- a/administrator/components/com_contenthistory/views/compare/tmpl/compare.php +++ b/administrator/components/com_contenthistory/views/compare/tmpl/compare.php @@ -41,11 +41,11 @@ + + diff --git a/administrator/components/com_contenthistory/views/history/tmpl/modal.php b/administrator/components/com_contenthistory/views/history/tmpl/modal.php index 056ef8238099d..56b249f84a99e 100644 --- a/administrator/components/com_contenthistory/views/history/tmpl/modal.php +++ b/administrator/components/com_contenthistory/views/history/tmpl/modal.php @@ -151,7 +151,7 @@ save_date, 'Y-m-d H:i:s'); ?> sha1_hash == $hash) :?> -   +   home_language) : // Published Home pages ?> @@ -210,22 +210,22 @@ lang_code; ?> diff --git a/administrator/components/com_languages/views/overrides/tmpl/default.php b/administrator/components/com_languages/views/overrides/tmpl/default.php index a92c03007e6f6..27b7275ae8f05 100644 --- a/administrator/components/com_languages/views/overrides/tmpl/default.php +++ b/administrator/components/com_languages/views/overrides/tmpl/default.php @@ -32,8 +32,8 @@
- - + +
diff --git a/administrator/components/com_media/layouts/toolbar/deletemedia.php b/administrator/components/com_media/layouts/toolbar/deletemedia.php index 1212587492dea..6cbb440969ea6 100644 --- a/administrator/components/com_media/layouts/toolbar/deletemedia.php +++ b/administrator/components/com_media/layouts/toolbar/deletemedia.php @@ -12,5 +12,5 @@ $title = JText::_('JTOOLBAR_DELETE'); ?> diff --git a/administrator/components/com_media/layouts/toolbar/newfolder.php b/administrator/components/com_media/layouts/toolbar/newfolder.php index 9039cc4b41938..30077a2b111d1 100644 --- a/administrator/components/com_media/layouts/toolbar/newfolder.php +++ b/administrator/components/com_media/layouts/toolbar/newfolder.php @@ -12,5 +12,5 @@ $title = JText::_('COM_MEDIA_CREATE_NEW_FOLDER'); ?> diff --git a/administrator/components/com_media/layouts/toolbar/uploadmedia.php b/administrator/components/com_media/layouts/toolbar/uploadmedia.php index d27404b21ce0a..fabd39b812e86 100644 --- a/administrator/components/com_media/layouts/toolbar/uploadmedia.php +++ b/administrator/components/com_media/layouts/toolbar/uploadmedia.php @@ -12,5 +12,5 @@ $title = JText::_('JTOOLBAR_UPLOAD'); ?> diff --git a/administrator/components/com_media/views/images/tmpl/default.php b/administrator/components/com_media/views/images/tmpl/default.php index b4b78ae32d95e..71faee78f26e6 100644 --- a/administrator/components/com_media/views/images/tmpl/default.php +++ b/administrator/components/com_media/views/images/tmpl/default.php @@ -131,7 +131,7 @@
- +

config->get('upload_maxsize') == '0' ? JText::_('COM_MEDIA_UPLOAD_FILES_NOLIMIT') : JText::sprintf('COM_MEDIA_UPLOAD_FILES', $this->config->get('upload_maxsize')); ?>

diff --git a/administrator/components/com_media/views/imageslist/tmpl/default_folder.php b/administrator/components/com_media/views/imageslist/tmpl/default_folder.php index 1bdaec0e35b87..435283b8270cc 100644 --- a/administrator/components/com_media/views/imageslist/tmpl/default_folder.php +++ b/administrator/components/com_media/views/imageslist/tmpl/default_folder.php @@ -14,7 +14,7 @@
  • - +
    _tmp_folder->name, 10, false); ?> diff --git a/administrator/components/com_media/views/media/tmpl/default.php b/administrator/components/com_media/views/media/tmpl/default.php index eabdffab02be2..88d70fc5dbc9b 100644 --- a/administrator/components/com_media/views/media/tmpl/default.php +++ b/administrator/components/com_media/views/media/tmpl/default.php @@ -52,7 +52,7 @@
    - +

    config->get('upload_maxsize') == '0' ? JText::_('COM_MEDIA_UPLOAD_FILES_NOLIMIT') : JText::sprintf('COM_MEDIA_UPLOAD_FILES', $this->config->get('upload_maxsize')); ?>

    @@ -66,7 +66,7 @@ - +
    diff --git a/administrator/components/com_media/views/media/tmpl/default_folders.php b/administrator/components/com_media/views/media/tmpl/default_folders.php index 9ca3f3685cbac..68f6e7f811c0a 100644 --- a/administrator/components/com_media/views/media/tmpl/default_folders.php +++ b/administrator/components/com_media/views/media/tmpl/default_folders.php @@ -19,7 +19,7 @@ // Get a sanitised name for the target $target = str_replace('/', '-', $folder['data']->relative); ?>
  • - + name; ?> diff --git a/administrator/components/com_media/views/media/tmpl/default_navigation.php b/administrator/components/com_media/views/media/tmpl/default_navigation.php index 7a5a9c9776b58..176cfe31d4b62 100644 --- a/administrator/components/com_media/views/media/tmpl/default_navigation.php +++ b/administrator/components/com_media/views/media/tmpl/default_navigation.php @@ -13,7 +13,7 @@ ?>
    "> - + "> - +
    diff --git a/administrator/components/com_media/views/medialist/tmpl/details.php b/administrator/components/com_media/views/medialist/tmpl/details.php index b74d4bda2bc5f..a0e6cf657f774 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details.php +++ b/administrator/components/com_media/views/medialist/tmpl/details.php @@ -15,7 +15,7 @@

    - + state->folder != '') : ?> get($path, 'images') . '/' . $this->state->folder; ?> diff --git a/administrator/components/com_media/views/medialist/tmpl/details_doc.php b/administrator/components/com_media/views/medialist/tmpl/details_doc.php index 1fe5ee594ad29..a608c6014f6b9 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details_doc.php +++ b/administrator/components/com_media/views/medialist/tmpl/details_doc.php @@ -33,7 +33,7 @@ authorise('core.delete', 'com_media')):?>

    • diff --git a/administrator/components/com_media/views/medialist/tmpl/details_folder.php b/administrator/components/com_media/views/medialist/tmpl/details_folder.php index 556b387cbde4c..a76016dd70c0d 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details_folder.php +++ b/administrator/components/com_media/views/medialist/tmpl/details_folder.php @@ -15,7 +15,7 @@ authorise('core.delete', 'com_media')):?> diff --git a/administrator/components/com_media/views/medialist/tmpl/details_img.php b/administrator/components/com_media/views/medialist/tmpl/details_img.php index 916ff728f8219..d5cf918920992 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details_img.php +++ b/administrator/components/com_media/views/medialist/tmpl/details_img.php @@ -33,7 +33,7 @@ authorise('core.delete', 'com_media')):?> diff --git a/administrator/components/com_media/views/medialist/tmpl/details_up.php b/administrator/components/com_media/views/medialist/tmpl/details_up.php index 9a0cb96c94259..eaa869b6311dd 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details_up.php +++ b/administrator/components/com_media/views/medialist/tmpl/details_up.php @@ -15,7 +15,7 @@ @@ -161,7 +161,7 @@
    - +
    - - + +
    - - + +
    @@ -94,7 +94,7 @@
    @@ -107,7 +107,7 @@ ?> diff --git a/administrator/components/com_users/views/debuguser/tmpl/default.php b/administrator/components/com_users/views/debuguser/tmpl/default.php index 418d1e6bc0e27..1f4c228455a32 100644 --- a/administrator/components/com_users/views/debuguser/tmpl/default.php +++ b/administrator/components/com_users/views/debuguser/tmpl/default.php @@ -32,8 +32,8 @@
    - - + +
    @@ -71,9 +71,9 @@ @@ -106,7 +106,7 @@ ?> diff --git a/administrator/components/com_users/views/groups/tmpl/default.php b/administrator/components/com_users/views/groups/tmpl/default.php index 1f5f466cc2b93..86fe7920be898 100644 --- a/administrator/components/com_users/views/groups/tmpl/default.php +++ b/administrator/components/com_users/views/groups/tmpl/default.php @@ -87,8 +87,8 @@
    - - + +
    diff --git a/administrator/components/com_users/views/levels/tmpl/default.php b/administrator/components/com_users/views/levels/tmpl/default.php index 3b7809c23f6bb..5139ccae58720 100644 --- a/administrator/components/com_users/views/levels/tmpl/default.php +++ b/administrator/components/com_users/views/levels/tmpl/default.php @@ -61,8 +61,8 @@
    - - + +
    @@ -94,7 +94,7 @@
    @@ -162,7 +162,7 @@ -   +  
    - - + +
    diff --git a/administrator/components/com_finder/views/index/tmpl/default.php b/administrator/components/com_finder/views/index/tmpl/default.php index c708d44a4e815..683d62a945963 100644 --- a/administrator/components/com_finder/views/index/tmpl/default.php +++ b/administrator/components/com_finder/views/index/tmpl/default.php @@ -65,8 +65,8 @@
    - - + +
    @@ -145,7 +145,7 @@
    		publish_start_date) or intval($item->publish_end_date) or intval($item->start_date) or intval($item->end_date)) : ?> - + diff --git a/administrator/components/com_finder/views/maps/tmpl/default.php b/administrator/components/com_finder/views/maps/tmpl/default.php index 31ea6383a40e8..27192a0c20c98 100644 --- a/administrator/components/com_finder/views/maps/tmpl/default.php +++ b/administrator/components/com_finder/views/maps/tmpl/default.php @@ -51,8 +51,8 @@
    - - + +
    diff --git a/administrator/components/com_installer/views/discover/tmpl/default.php b/administrator/components/com_installer/views/discover/tmpl/default.php index eb52bcea6e144..49fb156b81ce4 100644 --- a/administrator/components/com_installer/views/discover/tmpl/default.php +++ b/administrator/components/com_installer/views/discover/tmpl/default.php @@ -45,8 +45,8 @@
    - - + +
    diff --git a/administrator/components/com_installer/views/languages/tmpl/default_filter.php b/administrator/components/com_installer/views/languages/tmpl/default_filter.php index 420de2394fa1e..92e7562ca8c0b 100644 --- a/administrator/components/com_installer/views/languages/tmpl/default_filter.php +++ b/administrator/components/com_installer/views/languages/tmpl/default_filter.php @@ -20,8 +20,8 @@
    - - + +
    diff --git a/administrator/components/com_installer/views/manage/tmpl/default.php b/administrator/components/com_installer/views/manage/tmpl/default.php index 7ff87ffed9697..98ef1a6aeb733 100644 --- a/administrator/components/com_installer/views/manage/tmpl/default.php +++ b/administrator/components/com_installer/views/manage/tmpl/default.php @@ -43,8 +43,8 @@
    - - + +
    diff --git a/administrator/components/com_installer/views/update/tmpl/default.php b/administrator/components/com_installer/views/update/tmpl/default.php index fd4706e7c9750..73e18c30d9745 100644 --- a/administrator/components/com_installer/views/update/tmpl/default.php +++ b/administrator/components/com_installer/views/update/tmpl/default.php @@ -39,8 +39,8 @@
    - - + +
    diff --git a/administrator/components/com_installer/views/updatesites/tmpl/default.php b/administrator/components/com_installer/views/updatesites/tmpl/default.php index cd1183349960f..dac0c514d501d 100644 --- a/administrator/components/com_installer/views/updatesites/tmpl/default.php +++ b/administrator/components/com_installer/views/updatesites/tmpl/default.php @@ -35,8 +35,8 @@
    - - + +
    diff --git a/administrator/components/com_languages/views/languages/tmpl/default.php b/administrator/components/com_languages/views/languages/tmpl/default.php index 57428581b4af0..8020a5ae6eb71 100644 --- a/administrator/components/com_languages/views/languages/tmpl/default.php +++ b/administrator/components/com_languages/views/languages/tmpl/default.php @@ -64,8 +64,8 @@
    - - + +
    @@ -97,7 +97,7 @@
    - ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> @@ -157,12 +157,12 @@ $disableClassName = 'inactive tip-top'; endif; ?> - + - + diff --git a/administrator/components/com_languages/views/multilangstatus/tmpl/default.php b/administrator/components/com_languages/views/multilangstatus/tmpl/default.php index 81284bf998a27..1a7e979225e1e 100644 --- a/administrator/components/com_languages/views/multilangstatus/tmpl/default.php +++ b/administrator/components/com_languages/views/multilangstatus/tmpl/default.php @@ -26,7 +26,7 @@
    - + @@ -36,7 +36,7 @@
    - + @@ -46,7 +46,7 @@
    - + @@ -57,7 +57,7 @@ lang_code, $this->homepages) && (!array_key_exists($contentlang->lang_code, $this->site_langs) || !$contentlang->published)) : ?>
    - + lang_code); ?> @@ -67,7 +67,7 @@ lang_code, $this->site_langs)) : ?>
    - + lang_code); ?> @@ -78,7 +78,7 @@ listUsersError) : ?>
    - + @@ -176,7 +176,7 @@ element) : // Published Site languages ?> - + @@ -185,20 +185,20 @@ lang_code && $status->published) : // Published Content languages ?> - + - + - + - +
    - + published) : ?> - + published && array_key_exists($contentlang->lang_code, $this->homepages)) : ?> - + published) : ?> - + lang_code, $this->homepages)) : ?> - + - + - +
    - + _tmp_folder->name; ?> @@ -28,7 +28,7 @@ - + - +
    - + .. diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs.php b/administrator/components/com_media/views/medialist/tmpl/thumbs.php index 20b192040d6ba..1adc972dfeab2 100644 --- a/administrator/components/com_media/views/medialist/tmpl/thumbs.php +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs.php @@ -14,7 +14,7 @@

    - + state->folder != '') : ?> get($path, 'images') . '/' . $this->state->folder; ?> diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php index 74023c6ac0a87..1164a7bf686dc 100644 --- a/administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php @@ -18,7 +18,7 @@

    - +
    diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php index 932ffa3911ebf..00b213e31d303 100644 --- a/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php @@ -14,7 +14,7 @@
    - +
    diff --git a/administrator/components/com_menus/models/fields/menutype.php b/administrator/components/com_menus/models/fields/menutype.php index 4229d54de85b1..f3b832f7b529f 100644 --- a/administrator/components/com_menus/models/fields/menutype.php +++ b/administrator/components/com_menus/models/fields/menutype.php @@ -82,7 +82,9 @@ function jSelectPosition_' . $this->id . '(name) { $link = JRoute::_('index.php?option=com_menus&view=menutypes&tmpl=component&recordId=' . $recordId); $html[] = ''; - $html[] = ' ' . JText::_('JSELECT') . ''; + $html[] = '' + . ' ' + . JText::_('JSELECT') . ''; $html[] = JHtmlBootstrap::renderModal( 'menuTypeModal', array( 'url' => $link, diff --git a/administrator/components/com_menus/views/items/tmpl/default.php b/administrator/components/com_menus/views/items/tmpl/default.php index 510a179a34471..90fe54c9927cd 100644 --- a/administrator/components/com_menus/views/items/tmpl/default.php +++ b/administrator/components/com_menus/views/items/tmpl/default.php @@ -146,7 +146,7 @@ } ?> - + diff --git a/administrator/components/com_menus/views/menus/tmpl/default.php b/administrator/components/com_menus/views/menus/tmpl/default.php index e6daa807f7d44..81908f9d7cbdb 100644 --- a/administrator/components/com_menus/views/menus/tmpl/default.php +++ b/administrator/components/com_menus/views/menus/tmpl/default.php @@ -70,8 +70,8 @@
    - - + +
    @@ -94,19 +94,19 @@
    		- + - + - + - +
    - ', 'ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + ', 'ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> @@ -154,7 +154,7 @@ } ?> - + diff --git a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php index e5df00414c245..62bf9a2b9c292 100644 --- a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php +++ b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php @@ -144,7 +144,7 @@ protected function getInput() $html[] = '' - . ' ' . JText::_('JSELECT') + . ' ' . JText::_('JSELECT') . ''; $html[] = JHtmlBootstrap::renderModal( diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php index ff06f45d1c973..691b9adc42bce 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php @@ -66,8 +66,8 @@
    - - + +
    @@ -99,7 +99,7 @@
    - ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> @@ -161,7 +161,7 @@ } ?> - + diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php index aaad93196848e..ac629e8323a43 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php @@ -32,9 +32,9 @@
    + +
    diff --git a/administrator/components/com_plugins/views/plugins/tmpl/default.php b/administrator/components/com_plugins/views/plugins/tmpl/default.php index 6d9abdc88b9a1..25ea143c00e58 100644 --- a/administrator/components/com_plugins/views/plugins/tmpl/default.php +++ b/administrator/components/com_plugins/views/plugins/tmpl/default.php @@ -61,8 +61,8 @@
    - - + +
    @@ -94,7 +94,7 @@
    - ', 'ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + ', 'ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> @@ -147,7 +147,7 @@ } ?> - + diff --git a/administrator/components/com_redirect/helpers/html/redirect.php b/administrator/components/com_redirect/helpers/html/redirect.php index b067b4b156b59..857ac5181d553 100644 --- a/administrator/components/com_redirect/helpers/html/redirect.php +++ b/administrator/components/com_redirect/helpers/html/redirect.php @@ -49,8 +49,8 @@ public static function published($value = 0, $i = null, $canChange = true) if ($canChange) { - $html = ''; + $html = ''; } return $html; diff --git a/administrator/components/com_redirect/views/links/tmpl/default.php b/administrator/components/com_redirect/views/links/tmpl/default.php index a854680668775..c73aaa1c5bd65 100755 --- a/administrator/components/com_redirect/views/links/tmpl/default.php +++ b/administrator/components/com_redirect/views/links/tmpl/default.php @@ -35,8 +35,8 @@
    - - + +
    diff --git a/administrator/components/com_search/views/searches/tmpl/default.php b/administrator/components/com_search/views/searches/tmpl/default.php index 87889998a29d5..a2f3c198e74ae 100644 --- a/administrator/components/com_search/views/searches/tmpl/default.php +++ b/administrator/components/com_search/views/searches/tmpl/default.php @@ -25,8 +25,8 @@
    - - + +
    @@ -36,10 +36,10 @@ state->get('filter.results')) : ?> - + - +
    diff --git a/administrator/components/com_tags/views/tags/tmpl/default.php b/administrator/components/com_tags/views/tags/tmpl/default.php index 2b47745976828..71a12a92e5299 100644 --- a/administrator/components/com_tags/views/tags/tmpl/default.php +++ b/administrator/components/com_tags/views/tags/tmpl/default.php @@ -64,8 +64,8 @@
    - - + +
    @@ -98,7 +98,7 @@
    - ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> @@ -175,7 +175,7 @@ } ?> - + diff --git a/administrator/components/com_templates/views/style/tmpl/edit_assignment.php b/administrator/components/com_templates/views/style/tmpl/edit_assignment.php index 0eeae3c59d374..8e711bc694244 100644 --- a/administrator/components/com_templates/views/style/tmpl/edit_assignment.php +++ b/administrator/components/com_templates/views/style/tmpl/edit_assignment.php @@ -17,7 +17,7 @@
    		preview && $item->client_id == '0') : ?> - + client_id == '1') : ?> - + - + @@ -120,7 +120,7 @@ assigned > 0) : ?> - +   diff --git a/administrator/components/com_templates/views/template/tmpl/default.php b/administrator/components/com_templates/views/template/tmpl/default.php index efa086fab2e39..c3064ae9da881 100644 --- a/administrator/components/com_templates/views/template/tmpl/default.php +++ b/administrator/components/com_templates/views/template/tmpl/default.php @@ -207,10 +207,10 @@ function clearCoords() archive as $file): ?>
  • -   +   -   +  
    • @@ -299,7 +299,7 @@ function clearCoords() overridesList['modules'] as $module): ?>
  • -  name; ?> +  name; ?>
    • @@ -311,13 +311,13 @@ function clearCoords() overridesList['components'] as $key => $value): ?>
  • -   +  
    • -  name; ?> +  name; ?>
      • @@ -332,7 +332,7 @@ function clearCoords() overridesList['layouts'] as $layout): ?>
    • -  name; ?> +  name; ?>
      • diff --git a/administrator/components/com_templates/views/template/tmpl/default_folders.php b/administrator/components/com_templates/views/template/tmpl/default_folders.php index 0f7261cec0954..8075e28733ab6 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_folders.php +++ b/administrator/components/com_templates/views/template/tmpl/default_folders.php @@ -16,7 +16,7 @@
    • -   +   folderTree($value); ?>
      • diff --git a/administrator/components/com_templates/views/template/tmpl/default_tree.php b/administrator/components/com_templates/views/template/tmpl/default_tree.php index 76800775d0b13..d7743d2d1472b 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_tree.php +++ b/administrator/components/com_templates/views/template/tmpl/default_tree.php @@ -46,7 +46,7 @@ ?>
    • -   +   directoryTree($value); ?>
      • @@ -54,7 +54,7 @@
    • id . '&file=' . $value->id) ?>'> -  name; ?> +  name; ?>
      • diff --git a/administrator/components/com_templates/views/templates/tmpl/default.php b/administrator/components/com_templates/views/templates/tmpl/default.php index 1257f659c37b8..086ce527054a0 100644 --- a/administrator/components/com_templates/views/templates/tmpl/default.php +++ b/administrator/components/com_templates/views/templates/tmpl/default.php @@ -32,8 +32,8 @@
      - - + +
      diff --git a/administrator/components/com_users/helpers/html/users.php b/administrator/components/com_users/helpers/html/users.php index cec89226351d9..0c219212368b6 100644 --- a/administrator/components/com_users/helpers/html/users.php +++ b/administrator/components/com_users/helpers/html/users.php @@ -54,8 +54,8 @@ public static function addNote($userId) { $title = JText::_('COM_USERS_ADD_NOTE'); - return '' - . '' . $title . ''; + return '' + . '' . $title . ''; } /** @@ -77,8 +77,8 @@ public static function filterNotes($count, $userId) $title = JText::_('COM_USERS_FILTER_NOTES'); - return '' - . ''; + return '' + . JHtml::_('image', 'admin/filter_16.png', 'COM_USERS_NOTES', array('title' => $title), true) . ''; } /** @@ -101,7 +101,7 @@ public static function notes($count, $userId) $title = JText::plural('COM_USERS_N_USER_NOTES', $count); return '' - . '' . $title . ''; + . '' . $title . ''; } /** diff --git a/administrator/components/com_users/views/debuggroup/tmpl/default.php b/administrator/components/com_users/views/debuggroup/tmpl/default.php index 75ac5002a3f48..67c69d077eaa1 100644 --- a/administrator/components/com_users/views/debuggroup/tmpl/default.php +++ b/administrator/components/com_users/views/debuggroup/tmpl/default.php @@ -33,8 +33,8 @@
      - - + +
      @@ -72,9 +72,9 @@
    • - - - + + +
    - +
    - - - + + +
    - +
    - ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> @@ -136,7 +136,7 @@ } ?> - + diff --git a/administrator/components/com_users/views/notes/tmpl/default.php b/administrator/components/com_users/views/notes/tmpl/default.php index 813f4693fca46..8a58f4a3c2a67 100644 --- a/administrator/components/com_users/views/notes/tmpl/default.php +++ b/administrator/components/com_users/views/notes/tmpl/default.php @@ -51,8 +51,8 @@
    - - + +
    diff --git a/administrator/components/com_users/views/users/tmpl/modal.php b/administrator/components/com_users/views/users/tmpl/modal.php index 9ad5d15d92ac3..db1baba4aa033 100644 --- a/administrator/components/com_users/views/users/tmpl/modal.php +++ b/administrator/components/com_users/views/users/tmpl/modal.php @@ -29,8 +29,8 @@
    - - + +
    diff --git a/administrator/includes/toolbar.php b/administrator/includes/toolbar.php index 7aecce0212c91..17fafd999a08f 100644 --- a/administrator/includes/toolbar.php +++ b/administrator/includes/toolbar.php @@ -631,7 +631,7 @@ public static function modal($targetModalId, $icon, $alt) $title = JText::_($alt); $dhtml = ""; + " . $title . ""; $bar = JToolbar::getInstance('toolbar'); $bar->appendButton('Custom', $dhtml, $alt); diff --git a/administrator/modules/mod_latest/tmpl/default.php b/administrator/modules/mod_latest/tmpl/default.php index f8f5a5323a56b..34c3e3312a8d7 100644 --- a/administrator/modules/mod_latest/tmpl/default.php +++ b/administrator/modules/mod_latest/tmpl/default.php @@ -36,7 +36,7 @@
    - created, JText::_('DATE_FORMAT_LC4')); ?> + created, JText::_('DATE_FORMAT_LC4')); ?>
    diff --git a/administrator/modules/mod_logged/tmpl/default.php b/administrator/modules/mod_logged/tmpl/default.php index dafebca2145d8..2cff73b7ebbed 100644 --- a/administrator/modules/mod_logged/tmpl/default.php +++ b/administrator/modules/mod_logged/tmpl/default.php @@ -17,7 +17,7 @@
    client_id == 0) : ?> - + @@ -41,7 +41,7 @@
    - time, JText::_('DATE_FORMAT_LC4')); ?> + time, JText::_('DATE_FORMAT_LC4')); ?>
    diff --git a/administrator/modules/mod_login/tmpl/default.php b/administrator/modules/mod_login/tmpl/default.php index 56530ef1bbe36..1c247a68af149 100644 --- a/administrator/modules/mod_login/tmpl/default.php +++ b/administrator/modules/mod_login/tmpl/default.php @@ -20,14 +20,14 @@
    - + - +
    @@ -36,14 +36,14 @@
    - + - +
    @@ -53,14 +53,14 @@
    - + - +
    @@ -71,7 +71,7 @@
    - + @@ -85,7 +85,7 @@
    diff --git a/administrator/modules/mod_menu/tmpl/default_enabled.php b/administrator/modules/mod_menu/tmpl/default_enabled.php index 43a7647a0a4fe..2942535561ed8 100644 --- a/administrator/modules/mod_menu/tmpl/default_enabled.php +++ b/administrator/modules/mod_menu/tmpl/default_enabled.php @@ -151,7 +151,7 @@ } elseif ($menuType->home == 1 && $menuType->language == '*') { - $titleicon = ' '; + $titleicon = ' '; } elseif ($menuType->home > 1) { diff --git a/administrator/modules/mod_multilangstatus/tmpl/default.php b/administrator/modules/mod_multilangstatus/tmpl/default.php index fde2211a25858..820b4d8076403 100644 --- a/administrator/modules/mod_multilangstatus/tmpl/default.php +++ b/administrator/modules/mod_multilangstatus/tmpl/default.php @@ -19,7 +19,7 @@ ?>
    - +
    diff --git a/administrator/modules/mod_popular/tmpl/default.php b/administrator/modules/mod_popular/tmpl/default.php index dcddead5ec75b..367ec67621dae 100644 --- a/administrator/modules/mod_popular/tmpl/default.php +++ b/administrator/modules/mod_popular/tmpl/default.php @@ -35,7 +35,7 @@
    - + created, JText::_('DATE_FORMAT_LC4')); ?>
    diff --git a/administrator/modules/mod_stats_admin/tmpl/default.php b/administrator/modules/mod_stats_admin/tmpl/default.php index 5dce93379df5d..71408be912978 100644 --- a/administrator/modules/mod_stats_admin/tmpl/default.php +++ b/administrator/modules/mod_stats_admin/tmpl/default.php @@ -11,6 +11,6 @@ ?>
      -
    • title; ?> data; ?>
      • +
    • title; ?> data; ?>
    diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php index d84b63d7036b7..d80911dd3b34b 100644 --- a/administrator/modules/mod_status/tmpl/default.php +++ b/administrator/modules/mod_status/tmpl/default.php @@ -18,7 +18,7 @@ { $output[] = '
    ' . '' - . ' ' . JText::_('JGLOBAL_VIEW_SITE') + . ' ' . JText::_('JGLOBAL_VIEW_SITE') . '' . '
    ' . '
    '; @@ -49,7 +49,7 @@ $output[] = '
    ' . ($hideLinks ? '' : '') - . ' ' + . ' ' . '' . $unread . '' . ($hideLinks ? '' : '') . '
    ' @@ -70,7 +70,7 @@ { $output[] = '
    ' . ($hideLinks ? '' : '') - . ' ' . JText::_('JLOGOUT') + . ' ' . JText::_('JLOGOUT') . ($hideLinks ? '' : '') . '
    '; } diff --git a/administrator/templates/hathor/html/com_templates/template/default.php b/administrator/templates/hathor/html/com_templates/template/default.php index 5f352f879dce1..ee9814b4f48c9 100644 --- a/administrator/templates/hathor/html/com_templates/template/default.php +++ b/administrator/templates/hathor/html/com_templates/template/default.php @@ -334,10 +334,10 @@ function clearCoords() archive as $file): ?>
  • -   +   -   +  
    • @@ -465,7 +465,7 @@ function clearCoords() overridesList['modules'] as $module): ?>
  • -  name; ?> +  name; ?>
    • @@ -477,13 +477,13 @@ function clearCoords() overridesList['components'] as $key => $value): ?>
  • -   +  
    • -  name; ?> +  name; ?>
      • @@ -498,7 +498,7 @@ function clearCoords() overridesList['layouts'] as $layout): ?>
    • -  name; ?> +  name; ?>
      • diff --git a/administrator/templates/hathor/html/com_templates/template/default_folders.php b/administrator/templates/hathor/html/com_templates/template/default_folders.php index 0f7261cec0954..8075e28733ab6 100644 --- a/administrator/templates/hathor/html/com_templates/template/default_folders.php +++ b/administrator/templates/hathor/html/com_templates/template/default_folders.php @@ -16,7 +16,7 @@
    • -   +   folderTree($value); ?>
      • diff --git a/administrator/templates/hathor/html/com_templates/template/default_tree.php b/administrator/templates/hathor/html/com_templates/template/default_tree.php index ce5c57bc9cc23..51b6b72cc2f33 100644 --- a/administrator/templates/hathor/html/com_templates/template/default_tree.php +++ b/administrator/templates/hathor/html/com_templates/template/default_tree.php @@ -46,7 +46,7 @@ ?>
    • -   +   directoryTree($value); ?>
      • @@ -54,7 +54,7 @@
    • id . '&file=' . $value->id) ?>'> -  name; ?> +  name; ?>
      • diff --git a/administrator/templates/hathor/html/mod_menu/default_enabled.php b/administrator/templates/hathor/html/mod_menu/default_enabled.php index 542dbc4cecdc0..09e0990c96ff1 100644 --- a/administrator/templates/hathor/html/mod_menu/default_enabled.php +++ b/administrator/templates/hathor/html/mod_menu/default_enabled.php @@ -142,7 +142,7 @@ } elseif ($menuType->home == 1 && $menuType->language == '*') { - $titleicon = ' '; + $titleicon = ' '; } elseif ($menuType->home > 1) { diff --git a/administrator/templates/isis/error.php b/administrator/templates/isis/error.php index 6e27ce7cd7644..4c73b9e98b860 100644 --- a/administrator/templates/isis/error.php +++ b/administrator/templates/isis/error.php @@ -154,7 +154,7 @@
      • - +
        • @@ -228,7 +228,7 @@ debug) : ?> renderBacktrace(); ?> -

          +

    • diff --git a/administrator/templates/isis/html/pagination.php b/administrator/templates/isis/html/pagination.php index 0aee1f036d7b7..16265406ed490 100644 --- a/administrator/templates/isis/html/pagination.php +++ b/administrator/templates/isis/html/pagination.php @@ -152,26 +152,26 @@ function pagination_item_active(&$item) // Check for "Start" item if ($item->text == JText::_('JLIB_HTML_START')) { - $display = ''; + $display = ''; } // Check for "Prev" item if ($item->text == JText::_('JPREV')) { $item->text = JText::_('JPREVIOUS'); - $display = ''; + $display = ''; } // Check for "Next" item if ($item->text == JText::_('JNEXT')) { - $display = ''; + $display = ''; } // Check for "End" item if ($item->text == JText::_('JLIB_HTML_END')) { - $display = ''; + $display = ''; } // If the display object isn't set already, just render the item with its text @@ -214,25 +214,25 @@ function pagination_item_inactive(&$item) // Check for "Start" item if ($item->text == JText::_('JLIB_HTML_START')) { - return '
    • '; + return '
    • '; } // Check for "Prev" item if ($item->text == JText::_('JPREV')) { - return '
    • '; + return '
    • '; } // Check for "Next" item if ($item->text == JText::_('JNEXT')) { - return '
    • '; + return '
    • '; } // Check for "End" item if ($item->text == JText::_('JLIB_HTML_END')) { - return '
    • '; + return '
    • '; } // Check if the item is the active page diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php index 6c0c06d844286..ecd960465dba6 100644 --- a/administrator/templates/isis/index.php +++ b/administrator/templates/isis/index.php @@ -168,7 +168,7 @@ function colorIsLight($color)
    • > - +
      • @@ -220,7 +220,7 @@ function colorIsLight($color) - +
        diff --git a/administrator/templates/isis/login.php b/administrator/templates/isis/login.php index e160d9a1e1702..e1c6eee382c57 100644 --- a/administrator/templates/isis/login.php +++ b/administrator/templates/isis/login.php @@ -123,8 +123,8 @@ function colorIsLight($color)

        ©

        - - + +
        diff --git a/components/com_config/view/config/tmpl/default.php b/components/com_config/view/config/tmpl/default.php index 9eab7a7d0b4f5..73a5c7f58da3f 100644 --- a/components/com_config/view/config/tmpl/default.php +++ b/components/com_config/view/config/tmpl/default.php @@ -32,12 +32,12 @@
        diff --git a/components/com_config/view/modules/tmpl/default.php b/components/com_config/view/modules/tmpl/default.php index 7dfb4168a5d10..b90ba06d00f78 100644 --- a/components/com_config/view/modules/tmpl/default.php +++ b/components/com_config/view/modules/tmpl/default.php @@ -49,21 +49,21 @@ class="form-validate">
        @@ -157,7 +157,7 @@ class="form-validate"> form->getInput('ordering'); ?>
        - +
        form->getLabel('language'); ?> diff --git a/components/com_config/view/templates/tmpl/default.php b/components/com_config/view/templates/tmpl/default.php index 5c0a6f772ecf4..d425f84a01a0d 100644 --- a/components/com_config/view/templates/tmpl/default.php +++ b/components/com_config/view/templates/tmpl/default.php @@ -32,12 +32,12 @@
        diff --git a/installation/view/complete/tmpl/default.php b/installation/view/complete/tmpl/default.php index 70962ca9c4fc9..26012c8843a50 100644 --- a/installation/view/complete/tmpl/default.php +++ b/installation/view/complete/tmpl/default.php @@ -25,10 +25,10 @@ class="form-validate form-horizontal">
        - +
        - +
        @@ -65,7 +65,7 @@ class="form-validate form-horizontal">

        -

        +

        diff --git a/installation/view/database/tmpl/default.php b/installation/view/database/tmpl/default.php index f045fd0438e95..64d6bf451e7f9 100644 --- a/installation/view/database/tmpl/default.php +++ b/installation/view/database/tmpl/default.php @@ -15,8 +15,8 @@
        - - + +

        diff --git a/installation/view/defaultlanguage/tmpl/default.php b/installation/view/defaultlanguage/tmpl/default.php index 063bf5ee47b16..a41818ce347a1 100644 --- a/installation/view/defaultlanguage/tmpl/default.php +++ b/installation/view/defaultlanguage/tmpl/default.php @@ -19,7 +19,7 @@ class="btn" onclick="return Install.goToPage('languages');" rel="prev" title=""> - + @@ -30,7 +30,7 @@ class="btn btn-primary" onclick="Install.submitform();" rel="next" title=""> - + diff --git a/installation/view/ftp/tmpl/default.php b/installation/view/ftp/tmpl/default.php index e572f846bf563..3a45748744aac 100644 --- a/installation/view/ftp/tmpl/default.php +++ b/installation/view/ftp/tmpl/default.php @@ -14,8 +14,8 @@
        - - + +

        @@ -54,7 +54,7 @@
        - +
        @@ -63,7 +63,7 @@
        - form->getInput('ftp_host'); ?> + form->getInput('ftp_host'); ?>
        diff --git a/installation/view/languages/tmpl/default.php b/installation/view/languages/tmpl/default.php index 73a62f8833461..b132654872dbb 100644 --- a/installation/view/languages/tmpl/default.php +++ b/installation/view/languages/tmpl/default.php @@ -33,7 +33,7 @@ class="btn" onclick="return Install.goToPage('remove');" rel="prev" title=""> - + @@ -55,7 +55,7 @@ class="btn btn-primary" - +

        diff --git a/installation/view/preinstall/tmpl/default.php b/installation/view/preinstall/tmpl/default.php index 0a3482520ed02..cfb5db4177ca5 100644 --- a/installation/view/preinstall/tmpl/default.php +++ b/installation/view/preinstall/tmpl/default.php @@ -12,7 +12,7 @@ ?>
        - +
        @@ -45,7 +45,7 @@ state) ? 'JYES' : 'JNO'); ?> notice):?> - + diff --git a/installation/view/remove/tmpl/default.php b/installation/view/remove/tmpl/default.php index c25cadfd373c3..9985710b138a5 100644 --- a/installation/view/remove/tmpl/default.php +++ b/installation/view/remove/tmpl/default.php @@ -25,10 +25,10 @@
        - +
        - +
        diff --git a/installation/view/site/tmpl/default.php b/installation/view/site/tmpl/default.php index 5e8d7e90c7055..86489889dc1c2 100644 --- a/installation/view/site/tmpl/default.php +++ b/installation/view/site/tmpl/default.php @@ -14,7 +14,7 @@
        - +
        diff --git a/installation/view/summary/tmpl/default.php b/installation/view/summary/tmpl/default.php index 94cd3d46281ad..cf0b426b2e2cd 100644 --- a/installation/view/summary/tmpl/default.php +++ b/installation/view/summary/tmpl/default.php @@ -20,8 +20,8 @@
        - - + +
        @@ -296,7 +296,7 @@ state) ? 'JYES' : 'JNO'); ?> notice):?> - + diff --git a/layouts/joomla/editors/buttons/button.php b/layouts/joomla/editors/buttons/button.php index 847e96675facd..704bb3b3ad2dc 100644 --- a/layouts/joomla/editors/buttons/button.php +++ b/layouts/joomla/editors/buttons/button.php @@ -21,6 +21,6 @@ $title = ($button->get('title')) ? $button->get('title') : $button->get('text'); ?> rel="get('options'); ?>"> - get('text'); ?> + get('text'); ?> > > - +
        • diff --git a/layouts/joomla/pagination/link.php b/layouts/joomla/pagination/link.php index 11b7bd34e0a7d..8affcf24bc488 100644 --- a/layouts/joomla/pagination/link.php +++ b/layouts/joomla/pagination/link.php @@ -43,7 +43,7 @@ if ($icon !== null) { - $display = ''; + $display = ''; } if ($displayData['active']) diff --git a/layouts/joomla/quickicons/icon.php b/layouts/joomla/quickicons/icon.php index 5d05a8927b1b5..bf05cc09034b8 100644 --- a/layouts/joomla/quickicons/icon.php +++ b/layouts/joomla/quickicons/icon.php @@ -19,7 +19,7 @@
        >
        > - +
        diff --git a/layouts/joomla/searchtools/default/bar.php b/layouts/joomla/searchtools/default/bar.php index 93b14dd053e0c..187b2ceb40ec5 100644 --- a/layouts/joomla/searchtools/default/bar.php +++ b/layouts/joomla/searchtools/default/bar.php @@ -36,13 +36,13 @@
        input; ?>
        diff --git a/layouts/joomla/searchtools/grid/sort.php b/layouts/joomla/searchtools/grid/sort.php index 272101cc2b304..b109e3b26156b 100644 --- a/layouts/joomla/searchtools/grid/sort.php +++ b/layouts/joomla/searchtools/grid/sort.php @@ -16,12 +16,12 @@ ?> icon)) : ?> - + title)) : ?> title); ?> order == $data->selected) : ?> - + diff --git a/layouts/joomla/tinymce/togglebutton.php b/layouts/joomla/tinymce/togglebutton.php index 79b08f6edb8d6..b6aa38defae42 100644 --- a/layouts/joomla/tinymce/togglebutton.php +++ b/layouts/joomla/tinymce/togglebutton.php @@ -18,7 +18,7 @@ onclick="tinyMCE.execCommand('mceToggleEditor', false, '');return false;" title="" > - + \ No newline at end of file diff --git a/layouts/joomla/toolbar/batch.php b/layouts/joomla/toolbar/batch.php index bfaa7155cb1e2..e15cb682d023b 100644 --- a/layouts/joomla/toolbar/batch.php +++ b/layouts/joomla/toolbar/batch.php @@ -16,7 +16,7 @@ $message = addslashes($message); ?> diff --git a/layouts/joomla/toolbar/popup.php b/layouts/joomla/toolbar/popup.php index a604f2b0d0417..296e1b2bb920c 100644 --- a/layouts/joomla/toolbar/popup.php +++ b/layouts/joomla/toolbar/popup.php @@ -17,6 +17,6 @@ $name = $displayData['name']; ?> diff --git a/layouts/joomla/toolbar/slider.php b/layouts/joomla/toolbar/slider.php index ec72ec68236c1..2444212ab6bf1 100644 --- a/layouts/joomla/toolbar/slider.php +++ b/layouts/joomla/toolbar/slider.php @@ -18,6 +18,6 @@ $onClose = $displayData['onClose']; ?> diff --git a/layouts/joomla/toolbar/versions.php b/layouts/joomla/toolbar/versions.php index 66b855541fe59..9cf4a3d3cf594 100644 --- a/layouts/joomla/toolbar/versions.php +++ b/layouts/joomla/toolbar/versions.php @@ -15,5 +15,5 @@ - + diff --git a/libraries/cms/form/field/contenthistory.php b/libraries/cms/form/field/contenthistory.php index 7564853ce870b..bd35755d9d1e5 100644 --- a/libraries/cms/form/field/contenthistory.php +++ b/libraries/cms/form/field/contenthistory.php @@ -46,7 +46,7 @@ protected function getInput() $html[] = ' '; diff --git a/libraries/cms/form/field/media.php b/libraries/cms/form/field/media.php index a35720b65e86d..2bdbf775580e3 100644 --- a/libraries/cms/form/field/media.php +++ b/libraries/cms/form/field/media.php @@ -363,7 +363,7 @@ protected function getInput() $tooltip = $previewImgEmpty . $previewImg; $options = array( 'title' => JText::_('JLIB_FORM_MEDIA_PREVIEW_SELECTED_IMAGE'), - 'text' => '', + 'text' => '', 'class' => 'hasTipPreview' ); @@ -414,7 +414,7 @@ protected function getInput() $html[] = 'jInsertFieldValue(\'\', \'' . $this->id . '\');'; $html[] = 'return false;'; $html[] = '">'; - $html[] = ''; + $html[] = ''; } $html[] = ''; diff --git a/libraries/cms/form/field/user.php b/libraries/cms/form/field/user.php index cb4f2d2fa7d0f..d2cbb578032e3 100644 --- a/libraries/cms/form/field/user.php +++ b/libraries/cms/form/field/user.php @@ -94,7 +94,7 @@ protected function getInput() { $html[] = ' '; - $html[] = ''; + $html[] = ''; } $html[] = ''; diff --git a/libraries/cms/html/grid.php b/libraries/cms/html/grid.php index 29f4c5fd5f605..b383652d666d0 100644 --- a/libraries/cms/html/grid.php +++ b/libraries/cms/html/grid.php @@ -101,7 +101,7 @@ public static function sort($title, $order, $direction = 'asc', $selected = '', if ($order == $selected) { - $html .= ' '; + $html .= ' '; } $html .= ''; @@ -273,7 +273,7 @@ public static function order($rows, $image = 'filesave.png', $task = 'saveorder' { return ''; + . JText::_('JLIB_HTML_SAVE_ORDER') . '">'; } /** diff --git a/libraries/cms/html/html.php b/libraries/cms/html/html.php index d3dcae6c58fca..a96d93a9c2538 100644 --- a/libraries/cms/html/html.php +++ b/libraries/cms/html/html.php @@ -1019,7 +1019,7 @@ public static function calendar($value, $name, $id, $format = '%Y-%m-%d', $attri return '' . '' - . '' + . '' . ''; } diff --git a/libraries/cms/html/jgrid.php b/libraries/cms/html/jgrid.php index 7cd4eda93cb13..6a5dcc9873e99 100644 --- a/libraries/cms/html/jgrid.php +++ b/libraries/cms/html/jgrid.php @@ -68,8 +68,7 @@ public static function action($i, $task, $prefix = '', $text = '', $active_title $html[] = ' href="javascript:void(0);" onclick="return listItemTask(\'' . $checkbox . $i . '\',\'' . $prefix . $task . '\')"'; $html[] = $tip ? ' title="' . $title . '"' : ''; $html[] = '>'; - $html[] = ''; - $html[] = ''; + $html[] = ''; $html[] = ''; } else @@ -80,11 +79,11 @@ public static function action($i, $task, $prefix = '', $text = '', $active_title if ($active_class == "protected") { - $html[] = ''; + $html[] = ''; } else { - $html[] = ''; + $html[] = ''; } $html[] = ''; diff --git a/libraries/joomla/form/fields/repeatable.php b/libraries/joomla/form/fields/repeatable.php index 785de3d822203..e1f39141e863e 100644 --- a/libraries/joomla/form/fields/repeatable.php +++ b/libraries/joomla/form/fields/repeatable.php @@ -99,7 +99,7 @@ protected function getInput() // Button for display the modal window $select = (string) $this->element['select'] ? JText::_((string) $this->element['select']) : JText::_('JLIB_FORM_BUTTON_SELECT'); - $icon = $this->element['icon'] ? ' ' : ''; + $icon = $this->element['icon'] ? ' ' : ''; $str[] = ''; if (is_array($this->value)) diff --git a/libraries/joomla/form/fields/rules.php b/libraries/joomla/form/fields/rules.php index fd3e9e573616a..84337e1305ee8 100644 --- a/libraries/joomla/form/fields/rules.php +++ b/libraries/joomla/form/fields/rules.php @@ -323,14 +323,14 @@ protected function getInput() } else { - $html[] = ' ' . JText::_('JLIB_RULES_NOT_ALLOWED_LOCKED') + $html[] = ' ' . JText::_('JLIB_RULES_NOT_ALLOWED_LOCKED') . ''; } } } elseif (!empty($component)) { - $html[] = ' ' . JText::_('JLIB_RULES_ALLOWED_ADMIN') + $html[] = ' ' . JText::_('JLIB_RULES_ALLOWED_ADMIN') . ''; } else @@ -344,12 +344,12 @@ protected function getInput() elseif ($inheritedRule === false) { // Other actions cannot be changed. - $html[] = ' ' + $html[] = ' ' . JText::_('JLIB_RULES_NOT_ALLOWED_ADMIN_CONFLICT') . ''; } else { - $html[] = ' ' . JText::_('JLIB_RULES_ALLOWED_ADMIN') + $html[] = ' ' . JText::_('JLIB_RULES_ALLOWED_ADMIN') . ''; } } diff --git a/media/jui/js/treeselectmenu.jquery.js b/media/jui/js/treeselectmenu.jquery.js index 1b1d23f9e8d8a..9886676ef113a 100644 --- a/media/jui/js/treeselectmenu.jquery.js +++ b/media/jui/js/treeselectmenu.jquery.js @@ -12,14 +12,14 @@ jQuery(function($) $div = $li.find('div.treeselect-item:first'); // Add icons - $li.prepend(''); + $li.prepend(''); // Append clearfix $div.after('
        '); if ($li.find('ul.treeselect-sub').length) { // Add classes to Expand/Collapse icons - $li.find('i').addClass('treeselect-toggle icon-minus'); + $li.find('span.icon-').addClass('treeselect-toggle icon-minus'); // Append drop down menu in nodes $div.find('label:first').after(treeselectmenu); @@ -31,7 +31,7 @@ jQuery(function($) }); // Takes care of the Expand/Collapse of a node - $('i.treeselect-toggle').click(function() + $('span.treeselect-toggle').click(function() { $i = $(this); diff --git a/media/jui/js/treeselectmenu.jquery.min.js b/media/jui/js/treeselectmenu.jquery.min.js index 363b79c7a6cfb..24683ab13ab9c 100644 --- a/media/jui/js/treeselectmenu.jquery.min.js +++ b/media/jui/js/treeselectmenu.jquery.min.js @@ -2,4 +2,4 @@ * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ -jQuery(function(e){var t=e("div#treeselectmenu").html();e(".treeselect li").each(function(){$li=e(this);$div=$li.find("div.treeselect-item:first");$li.prepend('');$div.after('
        ');if($li.find("ul.treeselect-sub").length){$li.find("i").addClass("treeselect-toggle icon-minus");$div.find("label:first").after(t);if(!$li.find("ul.treeselect-sub ul.treeselect-sub").length){$li.find("div.treeselect-menu-expand").remove()}}});e("i.treeselect-toggle").click(function(){$i=e(this);if($i.parent().find("ul.treeselect-sub").is(":visible")){$i.removeClass("icon-minus").addClass("icon-plus");$i.parent().find("ul.treeselect-sub").hide();$i.parent().find("ul.treeselect-sub i.treeselect-toggle").removeClass("icon-minus").addClass("icon-plus")}else{$i.removeClass("icon-plus").addClass("icon-minus");$i.parent().find("ul.treeselect-sub").show();$i.parent().find("ul.treeselect-sub i.treeselect-toggle").removeClass("icon-plus").addClass("icon-minus")}});e("#treeselectfilter").keyup(function(){var t=e(this).val().toLowerCase();var n=0;e("#noresultsfound").hide();var r=e(".treeselect li");r.each(function(){if(e(this).text().toLowerCase().indexOf(t)==-1){e(this).hide();n++}else{e(this).show()}});if(n==r.length){e("#noresultsfound").show()}});e("#treeCheckAll").click(function(){e(".treeselect input").attr("checked","checked")});e("#treeUncheckAll").click(function(){e(".treeselect input").attr("checked",false)});e("#treeExpandAll").click(function(){e("ul.treeselect ul.treeselect-sub").show();e("ul.treeselect i.treeselect-toggle").removeClass("icon-plus").addClass("icon-minus")});e("#treeCollapseAll").click(function(){e("ul.treeselect ul.treeselect-sub").hide();e("ul.treeselect i.treeselect-toggle").removeClass("icon-minus").addClass("icon-plus")});e("a.checkall").click(function(){e(this).parents().eq(5).find("ul.treeselect-sub input").attr("checked","checked")});e("a.uncheckall").click(function(){e(this).parents().eq(5).find("ul.treeselect-sub input").attr("checked",false)});e("a.expandall").click(function(){var t=e(this).parents().eq(6);t.find("ul.treeselect-sub").show();t.find("ul.treeselect-sub i.treeselect-toggle").removeClass("icon-plus").addClass("icon-minus")});e("a.collapseall").click(function(){var t=e(this).parents().eq(6);t.find("li ul.treeselect-sub").hide();t.find("li i.treeselect-toggle").removeClass("icon-minus").addClass("icon-plus")})}) +jQuery(function(e){var t=e("div#treeselectmenu").html();e(".treeselect li").each(function(){$li=e(this);$div=$li.find("div.treeselect-item:first");$li.prepend('');$div.after('
        ');if($li.find("ul.treeselect-sub").length){$li.find("span.icon-").addClass("treeselect-toggle icon-minus");$div.find("label:first").after(t);if(!$li.find("ul.treeselect-sub ul.treeselect-sub").length){$li.find("div.treeselect-menu-expand").remove()}}});e("span.treeselect-toggle").click(function(){$i=e(this);if($i.parent().find("ul.treeselect-sub").is(":visible")){$i.removeClass("icon-minus").addClass("icon-plus");$i.parent().find("ul.treeselect-sub").hide();$i.parent().find("ul.treeselect-sub span.treeselect-toggle").removeClass("icon-minus").addClass("icon-plus")}else{$i.removeClass("icon-plus").addClass("icon-minus");$i.parent().find("ul.treeselect-sub").show();$i.parent().find("ul.treeselect-sub span.treeselect-toggle").removeClass("icon-plus").addClass("icon-minus")}});e("#treeselectfilter").keyup(function(){var t=e(this).val().toLowerCase();var n=0;e("#noresultsfound").hide();var r=e(".treeselect li");r.each(function(){if(e(this).text().toLowerCase().indexOf(t)==-1){e(this).hide();n++}else{e(this).show()}});if(n==r.length){e("#noresultsfound").show()}});e("#treeCheckAll").click(function(){e(".treeselect input").attr("checked","checked")});e("#treeUncheckAll").click(function(){e(".treeselect input").attr("checked",false)});e("#treeExpandAll").click(function(){e("ul.treeselect ul.treeselect-sub").show();e("ul.treeselect span.treeselect-toggle").removeClass("icon-plus").addClass("icon-minus")});e("#treeCollapseAll").click(function(){e("ul.treeselect ul.treeselect-sub").hide();e("ul.treeselect span.treeselect-toggle").removeClass("icon-minus").addClass("icon-plus")});e("a.checkall").click(function(){e(this).parents().eq(5).find("ul.treeselect-sub input").attr("checked","checked")});e("a.uncheckall").click(function(){e(this).parents().eq(5).find("ul.treeselect-sub input").attr("checked",false)});e("a.expandall").click(function(){var t=e(this).parents().eq(6);t.find("ul.treeselect-sub").show();t.find("ul.treeselect-sub span.treeselect-toggle").removeClass("icon-plus").addClass("icon-minus")});e("a.collapseall").click(function(){var t=e(this).parents().eq(6);t.find("li ul.treeselect-sub").hide();t.find("li span.treeselect-toggle").removeClass("icon-minus").addClass("icon-plus")})}) diff --git a/media/jui/less/sprites.less b/media/jui/less/sprites.less index 84607283d0836..f8ea6eb96a002 100644 --- a/media/jui/less/sprites.less +++ b/media/jui/less/sprites.less @@ -9,10 +9,10 @@ // All icons receive the styles of the tag with a base class // of .i and are then given a unique class to add width, height, // and background-position. Your resulting HTML will look like -// . +// . // For the white version of the icons, just add the .icon-white class: -// +// [class^="icon-"], [class*=" icon-"] { @@ -36,7 +36,7 @@ dl.article-info dd.hits span[class^="icon-"], dl.article-info dd.hits span[class*=" icon-"]{ margin-right: 0; } - + /* White icons with optional class, or on hover/focus/active states of certain elements */ .icon-white, .nav-pills > .active > a > [class^="icon-"], diff --git a/media/plg_quickicon_extensionupdate/js/extensionupdatecheck.js b/media/plg_quickicon_extensionupdate/js/extensionupdatecheck.js index 3e5bf26a45b83..8856db943ba57 100644 --- a/media/plg_quickicon_extensionupdate/js/extensionupdatecheck.js +++ b/media/plg_quickicon_extensionupdate/js/extensionupdatecheck.js @@ -6,49 +6,50 @@ jQuery(document).ready(function() { var ajax_structure = { success: function(data, textStatus, jqXHR) { + var link = jQuery('#plg_quickicon_extensionupdate').find('span.j-links-link'); + try { var updateInfoList = jQuery.parseJSON(data); - } catch(e) { + } catch (e) { // An error occured - jQuery('#plg_quickicon_extensionupdate').find('span').html(plg_quickicon_extensionupdate_text.ERROR); + link.html(plg_quickicon_extensionupdate_text.ERROR); } + if (updateInfoList instanceof Array) { if (updateInfoList.length == 0) { // No updates - jQuery('#plg_quickicon_extensionupdate').find('span').html(plg_quickicon_extensionupdate_text.UPTODATE); + link.html(plg_quickicon_extensionupdate_text.UPTODATE); } else { var updateString = plg_quickicon_extensionupdate_text.UPDATEFOUND_MESSAGE.replace("%s", updateInfoList.length); - if (jQuery('.alert-joomlaupdate').length == 0) - { + if (jQuery('.alert-joomlaupdate').length == 0) { jQuery('#system-message-container').prepend( '
        ' - + updateString - + ' ' - + '
        ' + + updateString + + ' ' + + '' ); } - else - { + else { jQuery('#system-message-container').prepend( '
        ' - + updateString - + ' ' - + '
        ' + + updateString + + ' ' + + '' ); } var updateString = plg_quickicon_extensionupdate_text.UPDATEFOUND.replace("%s", updateInfoList.length); - jQuery('#plg_quickicon_extensionupdate').find('span').html(updateString); + link.html(updateString); } } else { // An error occured - jQuery('#plg_quickicon_extensionupdate').find('span').html(plg_quickicon_extensionupdate_text.ERROR); + link.html(plg_quickicon_extensionupdate_text.ERROR); } }, error: function(jqXHR, textStatus, errorThrown) { // An error occured - jQuery('#plg_quickicon_extensionupdate').find('span').html(plg_quickicon_extensionupdate_text.ERROR); + jQuery('#plg_quickicon_extensionupdate').find('span.j-links-link').html(plg_quickicon_extensionupdate_text.ERROR); }, url: plg_quickicon_extensionupdate_ajax_url + '&eid=0&skip=700' }; diff --git a/media/plg_quickicon_joomlaupdate/js/jupdatecheck.js b/media/plg_quickicon_joomlaupdate/js/jupdatecheck.js index c58f6285339bc..416fc6eb97a5a 100644 --- a/media/plg_quickicon_joomlaupdate/js/jupdatecheck.js +++ b/media/plg_quickicon_joomlaupdate/js/jupdatecheck.js @@ -5,60 +5,58 @@ var plg_quickicon_jupdatecheck_ajax_structure = {}; -jQuery(document).ready(function() -{ +jQuery(document).ready(function() { plg_quickicon_jupdatecheck_ajax_structure = { - success: function(data, textStatus, jqXHR) - { + success: function(data, textStatus, jqXHR) { + var link = jQuery('#plg_quickicon_joomlaupdate').find('span.j-links-link'); + try { var updateInfoList = jQuery.parseJSON(data); } catch (e) { // An error occured - jQuery('#plg_quickicon_joomlaupdate').find('span').html(plg_quickicon_joomlaupdate_text.ERROR); + link.html(plg_quickicon_joomlaupdate_text.ERROR); } + if (updateInfoList instanceof Array) { if (updateInfoList.length < 1) { // No updates - jQuery('#plg_quickicon_joomlaupdate').find('span').replaceWith(plg_quickicon_joomlaupdate_text.UPTODATE); + link.replaceWith(plg_quickicon_joomlaupdate_text.UPTODATE); } else { var updateInfo = updateInfoList.shift(); if (updateInfo.version != plg_quickicon_jupdatecheck_jversion) { var updateString = plg_quickicon_joomlaupdate_text.UPDATEFOUND.replace("%s", updateInfo.version + ""); jQuery('#plg_quickicon_joomlaupdate').find('span').html(updateString); var updateString = plg_quickicon_joomlaupdate_text.UPDATEFOUND_MESSAGE.replace("%s", updateInfo.version + ""); - if (jQuery('.alert-joomlaupdate').length == 0) - { + if (jQuery('.alert-joomlaupdate').length == 0) { jQuery('#system-message-container').prepend( '
        ' - + updateString - + ' ' - + '
        ' + + updateString + + ' ' + + '' ); } - else - { + else { jQuery('#system-message-container').prepend( '
        ' - + updateString - + ' ' - + '
        ' + + updateString + + ' ' + + '' ); } - } else { - jQuery('#plg_quickicon_joomlaupdate').find('span').html(plg_quickicon_joomlaupdate_text.UPTODATE); + } else { + link.html(plg_quickicon_joomlaupdate_text.UPTODATE); } } } else { // An error occured - jQuery('#plg_quickicon_joomlaupdate').find('span').html(plg_quickicon_joomlaupdate_text.ERROR); + link.html(plg_quickicon_joomlaupdate_text.ERROR); } }, - error: function(jqXHR, textStatus, errorThrown) - { + error: function(jqXHR, textStatus, errorThrown) { // An error occured - jQuery('#plg_quickicon_joomlaupdate').find('span').html(plg_quickicon_joomlaupdate_text.ERROR); + jQuery('#plg_quickicon_joomlaupdate').find('span.j-links-link').html(plg_quickicon_joomlaupdate_text.ERROR); }, url: plg_quickicon_joomlaupdate_ajax_url + '&eid=700&cache_timeout=3600' }; diff --git a/modules/mod_finder/tmpl/default.php b/modules/mod_finder/tmpl/default.php index 3f520d3a505dd..8c0fd11a57c15 100644 --- a/modules/mod_finder/tmpl/default.php +++ b/modules/mod_finder/tmpl/default.php @@ -49,7 +49,7 @@ if ($params->get('show_button')) { - $button = ''; + $button = ''; switch ($params->get('button_pos', 'left')) { diff --git a/plugins/content/pagenavigation/tmpl/default.php b/plugins/content/pagenavigation/tmpl/default.php index a02c6cdea82e6..6b78040222037 100644 --- a/plugins/content/pagenavigation/tmpl/default.php +++ b/plugins/content/pagenavigation/tmpl/default.php @@ -16,7 +16,7 @@ $direction = $lang->isRTL() ? 'right' : 'left'; ?>         @@ -24,7 +24,7 @@ $direction = $lang->isRTL() ? 'left' : 'right'; ?> diff --git a/templates/beez3/html/com_weblinks/form/edit.php b/templates/beez3/html/com_weblinks/form/edit.php index 2fe7972741a02..624f3d0b54e7e 100644 --- a/templates/beez3/html/com_weblinks/form/edit.php +++ b/templates/beez3/html/com_weblinks/form/edit.php @@ -36,12 +36,12 @@
        diff --git a/templates/protostar/error.php b/templates/protostar/error.php index 49ea4591d2252..2906aa9a993d9 100644 --- a/templates/protostar/error.php +++ b/templates/protostar/error.php @@ -159,7 +159,7 @@ getBuffer('module', 'search'); ?>

        -

        +

        diff --git a/templates/protostar/html/pagination.php b/templates/protostar/html/pagination.php index 7678cebf76dcd..0cd60ca566703 100644 --- a/templates/protostar/html/pagination.php +++ b/templates/protostar/html/pagination.php @@ -152,25 +152,25 @@ function pagination_item_active(&$item) // Check for "Start" item if ($item->text == JText::_('JLIB_HTML_START')) { - $display = ''; + $display = ''; } // Check for "Prev" item if ($item->text == JText::_('JPREV')) { - $display = ''; + $display = ''; } // Check for "Next" item if ($item->text == JText::_('JNEXT')) { - $display = ''; + $display = ''; } // Check for "End" item if ($item->text == JText::_('JLIB_HTML_END')) { - $display = ''; + $display = ''; } // If the display object isn't set already, just render the item with its text @@ -197,25 +197,25 @@ function pagination_item_inactive(&$item) // Check for "Start" item if ($item->text == JText::_('JLIB_HTML_START')) { - return '
        • '; + return '
        • '; } // Check for "Prev" item if ($item->text == JText::_('JPREV')) { - return '
        • '; + return '
        • '; } // Check for "Next" item if ($item->text == JText::_('JNEXT')) { - return '
        • '; + return '
        • '; } // Check for "End" item if ($item->text == JText::_('JLIB_HTML_END')) { - return '
        • '; + return '
        • '; } // Check if the item is the active page diff --git a/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php b/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php index e6c9402dd6aaf..9fa44a8cb3db8 100644 --- a/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php +++ b/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php @@ -529,8 +529,8 @@ public function testGetLimitBox($total, $limitstart, $limit, $admin, $expected) public function dataTestOrderUpIcon() { return array( - array(0, '', true, 'orderup', 'JLIB_HTML_MOVE_UP', true, 'cb'), - array(2, '', true, 'orderup', 'JLIB_HTML_MOVE_UP', true, 'cb'), + array(0, '', true, 'orderup', 'JLIB_HTML_MOVE_UP', true, 'cb'), + array(2, '', true, 'orderup', 'JLIB_HTML_MOVE_UP', true, 'cb'), array(2, ' ', false, 'orderup', 'JLIB_HTML_MOVE_UP', true, 'cb'), ); } @@ -570,8 +570,8 @@ public function testOrderUpIcon($i, $expected, $condition = true, $task = 'order public function dataTestOrderDownIcon() { return array( - array(0, 100, '', true, 'orderup', 'JLIB_HTML_MOVE_DOWN', true, 'cb'), - array(2, 100, '', true, 'orderup', 'JLIB_HTML_MOVE_DOWN', true, 'cb'), + array(0, 100, '', true, 'orderup', 'JLIB_HTML_MOVE_DOWN', true, 'cb'), + array(2, 100, '', true, 'orderup', 'JLIB_HTML_MOVE_DOWN', true, 'cb'), array(2, 100, ' ', false, 'orderup', 'JLIB_HTML_MOVE_DOWN', true, 'cb'), ); }