From 943c5d886d0fb02a4554e80fde01de4792a5210e Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Wed, 7 Feb 2018 20:52:28 -0700 Subject: [PATCH 1/5] remove space indent exceptions --- build/phpcs/Joomla/ruleset.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/build/phpcs/Joomla/ruleset.xml b/build/phpcs/Joomla/ruleset.xml index 0b2d1219aea8c..ac4a3d675b0bd 100644 --- a/build/phpcs/Joomla/ruleset.xml +++ b/build/phpcs/Joomla/ruleset.xml @@ -82,12 +82,7 @@ - - - administrator/components/* - components/* - libraries/cms/* - + From f1ef1b0b94301d02c7b455814b35f8cbdd010415 Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Wed, 7 Feb 2018 20:59:48 -0700 Subject: [PATCH 2/5] tab indent not spaces --- administrator/components/com_menus/controllers/item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_menus/controllers/item.php b/administrator/components/com_menus/controllers/item.php index 2f25088d5fa6e..83770ba1c7cfb 100644 --- a/administrator/components/com_menus/controllers/item.php +++ b/administrator/components/com_menus/controllers/item.php @@ -337,7 +337,7 @@ public function save($key = null, $urlVar = null) $segments = explode(':', $data['link']); $protocol = strtolower($segments[0]); $scheme = array('http', 'https', 'ftp', 'ftps', 'gopher', 'mailto', 'news', 'prospero', 'telnet', 'rlogin', 'tn3270', 'wais','mid', 'cid', 'nntp', - 'tel', 'urn', 'ldap', 'file', 'fax', 'modem', 'git', 'sms'); + 'tel', 'urn', 'ldap', 'file', 'fax', 'modem', 'git', 'sms'); if (!in_array($protocol, $scheme)) { From 8bb80caaaa307dee05f4a9522f0ad02698701c75 Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Wed, 7 Feb 2018 21:01:10 -0700 Subject: [PATCH 3/5] Tabs must be used to indent lines; spaces are not allowed --- .../components/com_associations/models/fields/itemlanguage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_associations/models/fields/itemlanguage.php b/administrator/components/com_associations/models/fields/itemlanguage.php index a7b3cfaca7379..1c8ddf46d52ec 100644 --- a/administrator/components/com_associations/models/fields/itemlanguage.php +++ b/administrator/components/com_associations/models/fields/itemlanguage.php @@ -80,7 +80,7 @@ protected function getOptions() $itemId = (int) $associations[$language->lang_code]['id']; $options[$langCode]->value = $language->lang_code . ':' . $itemId . ':edit'; - // Check if user does have permission to edit the associated item. + // Check if user does have permission to edit the associated item. $canEdit = AssociationsHelper::allowEdit($extensionName, $typeName, $itemId); // Check if item can be checked out From b2af548dbd0cdf9375e2ae0ffc730f7a32b61bdb Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Wed, 7 Feb 2018 21:05:37 -0700 Subject: [PATCH 4/5] Tabs must be used to indent lines; spaces are not allowed try using the concatenation to fix space indent strangeness --- .../com_associations/views/associations/tmpl/modal.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_associations/views/associations/tmpl/modal.php b/administrator/components/com_associations/views/associations/tmpl/modal.php index 63520f408c2a6..6d21097cac952 100644 --- a/administrator/components/com_associations/views/associations/tmpl/modal.php +++ b/administrator/components/com_associations/views/associations/tmpl/modal.php @@ -46,8 +46,8 @@ });" ); ?> -
+ sidebar)) : ?>
From 9b6255e9fe6781f17690fae851705289f5bb5456 Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Wed, 7 Feb 2018 21:07:59 -0700 Subject: [PATCH 5/5] Tabs must be used to indent lines; spaces are not allowed --- components/com_content/content.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/com_content/content.php b/components/com_content/content.php index f0cd8505b95c0..187de0a8e7256 100644 --- a/components/com_content/content.php +++ b/components/com_content/content.php @@ -23,7 +23,7 @@ { // Can create in any category (component permission) or at least in one category $canCreateRecords = $user->authorise('core.create', 'com_content') - || count($user->getAuthorisedCategories('com_content', 'core.create')) > 0; + || count($user->getAuthorisedCategories('com_content', 'core.create')) > 0; // Instead of checking edit on all records, we can use **same** check as the form editing view $values = (array) JFactory::getApplication()->getUserState('com_content.edit.article.id');