diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c48cf4ecc7385..2434a62ddbf49 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,5 +3,3 @@ Pull Request for Issue # .
#### Summary of Changes
#### Testing Instructions
-
-#### Documentation Changes Required
diff --git a/.gitignore b/.gitignore
index f7d136459ad47..fa5ff5c4f07a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,13 +15,19 @@
/configuration.php
/.htaccess
/web.config
-/.php_cs.cache
# Test Related Files #
/phpunit.xml
-
-# Node modules #
-node_modules/
+/tests/system/webdriver/tests/logs/
+/tests/system/servers/configdef.php
+codecept.phar
+tests/codeception/_output/*
+tests/codeception/vendor/*
+tests/codeception/testingsite*
+tests/codeception/tests/acceptance.suite.yml
+tests/codeception/tests/acceptance/*Tester.php
+tests/codeception/tests/functional/*Tester.php
+tests/codeception/tests/unit/*Tester.php
# phpDocumentor Logs #
phpdoc-*
diff --git a/.php_cs b/.php_cs
deleted file mode 100644
index 597141e11be68..0000000000000
--- a/.php_cs
+++ /dev/null
@@ -1,65 +0,0 @@
-in(array(__DIR__ . '/libraries'))
- ->files()
- ->depth(0);
-
-$mainFinder = Symfony\CS\Finder\DefaultFinder::create()
- ->in(
- array(
- __DIR__ . '/libraries/cms',
- __DIR__ . '/libraries/joomla',
- __DIR__ . '/libraries/legacy',
- )
- )
- ->append($topFilesFinder);
-
-return Symfony\CS\Config\Config::create()
- ->setUsingLinter(false)
- ->setUsingCache(true)
- ->level(Symfony\CS\FixerInterface::NONE_LEVEL)
- ->fixers(
- array(
- // psr-1
- 'encoding',
- // psr-2
- 'elseif',
- 'eof_ending',
- 'function_call_space',
- 'line_after_namespace',
- 'linefeed',
- 'lowercase_constants',
- 'lowercase_keywords',
- 'method_argument_space',
- 'multiple_use',
- 'parenthesis',
- 'single_line_after_imports',
- 'trailing_spaces',
- 'visibility',
- // symfony
- 'array_element_no_space_before_comma',
- 'array_element_white_space_after_comma',
- 'duplicate_semicolon',
- 'empty_return',
- 'extra_empty_lines',
- 'function_typehint_space',
- 'include',
- 'join_function',
- 'list_commas',
- 'multiline_array_trailing_comma',
- 'no_blank_lines_after_class_opening',
- 'phpdoc_trim',
- 'return',
- 'single_array_no_trailing_comma',
- 'single_blank_line_before_namespace',
- 'spaces_cast',
- 'unneeded_control_parentheses',
- 'unused_use',
- 'whitespacy_lines',
- // contrib
- 'concat_with_spaces',
- 'long_array_syntax',
- )
- )
- ->finder($mainFinder);
diff --git a/.travis.yml b/.travis.yml
index bddbca6679011..c3e08c640bd94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,4 +67,4 @@ script:
branches:
except:
- - 2.5.x
+ - 2.5.x
\ No newline at end of file
diff --git a/README.md b/README.md
index 561e26ab5b99c..27e40e5019733 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Ready to install Joomla?
* Check the [minimum requirements](https://www.joomla.org/about-joomla/technical-requirements.html).
* How do you [install Joomla](https://docs.joomla.org/J3.x:Installing_Joomla)?
* You could start your Joomla! experience by [building your site on a local test server](https://docs.joomla.org/Installing_Joomla_locally).
-When ready, it can be moved to an on-line hosting account of your choice.
+When ready, it can be moved to an online hosting account of your choice.
Updates are free!
---------------------
diff --git a/README.txt b/README.txt
index 3b2b348276b67..7a384bd2c390e 100644
--- a/README.txt
+++ b/README.txt
@@ -38,7 +38,7 @@
* Check the minimum requirements here: https://www.joomla.org/about-joomla/technical-requirements.html
* How do you install Joomla - hhttps://docs.joomla.org/J3.x:Installing_Joomla
* You could start your Joomla! experience building your site on a local test server.
- When ready it can be moved to an on-line hosting account of your choice.
+ When ready it can be moved to an online hosting account of your choice.
See the tutorial: https://docs.joomla.org/Installing_Joomla_locally
9- Updates are free!
diff --git a/administrator/components/com_admin/models/help.php b/administrator/components/com_admin/models/help.php
index ca4295dc35466..f18f7f2a155c3 100644
--- a/administrator/components/com_admin/models/help.php
+++ b/administrator/components/com_admin/models/help.php
@@ -198,7 +198,7 @@ public function &getLatestVersionCheck()
{
if (!$this->latest_version_check)
{
- $override = 'https://help.joomla.org/proxy/index.php?keyref=Help{major}{minor}:'
+ $override = 'https://help.joomla.org/proxy/index.php?option=com_help&keyref=Help{major}{minor}:'
. 'Joomla_Version_{major}_{minor}_{maintenance}/{langcode}&lang={langcode}';
$this->latest_version_check = JHelp::createUrl('JVERSION', false, $override);
}
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index a66ac4149395c..1c398c5491440 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -250,8 +250,8 @@ protected function updateManifestCaches()
array('library', 'fof', '', 0),
array('library', 'phpass', '', 0),
- // Modules
- // - Site
+ // Modules site
+ // Site
array('module', 'mod_articles_archive', '', 0),
array('module', 'mod_articles_latest', '', 0),
array('module', 'mod_articles_popular', '', 0),
@@ -277,7 +277,7 @@ protected function updateManifestCaches()
array('module', 'mod_tags_popular', '', 0),
array('module', 'mod_tags_similar', '', 0),
- // - Administrator
+ // Administrator
array('module', 'mod_custom', '', 1),
array('module', 'mod_feed', '', 1),
array('module', 'mod_latest', '', 1),
@@ -1548,10 +1548,10 @@ public function deleteUnexistingFiles()
* Needed for updates post-3.4
* If com_weblinks doesn't exist then assume we can delete the weblinks package manifest (included in the update packages)
*/
- if (!JFile::exists(JPATH_ROOT . '/administrator/components/com_weblinks/weblinks.php')
- && JFile::exists(JPATH_ROOT . '/administrator/manifests/packages/pkg_weblinks.xml'))
+ if (!JFile::exists(JPATH_ADMINISTRATOR . '/components/com_weblinks/weblinks.php')
+ && JFile::exists(JPATH_MANIFESTS . '/packages/pkg_weblinks.xml'))
{
- JFile::delete(JPATH_ROOT . '/administrator/manifests/packages/pkg_weblinks.xml');
+ JFile::delete(JPATH_MANIFESTS . '/packages/pkg_weblinks.xml');
}
}
@@ -1568,9 +1568,9 @@ protected function clearRadCache()
{
jimport('joomla.filesystem.file');
- if (JFile::exists(JPATH_ROOT . '/cache/fof/cache.php'))
+ if (JFile::exists(JPATH_CACHE . '/fof/cache.php'))
{
- JFile::delete(JPATH_ROOT . '/cache/fof/cache.php');
+ JFile::delete(JPATH_CACHE . '/fof/cache.php');
}
}
@@ -1744,7 +1744,7 @@ public function convertTablesToUtf8mb4($doDbFixMsg = false)
}
// Step 1: Drop indexes later to be added again with column lengths limitations at step 2
- $fileName1 = JPATH_ROOT . "/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql";
+ $fileName1 = JPATH_ADMINISTRATOR . "/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql";
if (is_file($fileName1))
{
@@ -1768,7 +1768,7 @@ public function convertTablesToUtf8mb4($doDbFixMsg = false)
}
// Step 2: Perform the index modifications and conversions
- $fileName2 = JPATH_ROOT . "/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql";
+ $fileName2 = JPATH_ADMINISTRATOR . "/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql";
if (is_file($fileName2))
{
@@ -1814,14 +1814,8 @@ public function convertTablesToUtf8mb4($doDbFixMsg = false)
*/
private function cleanJoomlaCache()
{
- JModelLegacy::addIncludePath(JPATH_ROOT . '/administrator/components/com_cache/models');
+ JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_cache/models');
$model = JModelLegacy::getInstance('cache', 'CacheModel');
-
- // Clean frontend cache
- $model->clean();
-
- // Clean admin cache
- $model->setState('client_id', 1);
$model->clean();
}
}
diff --git a/administrator/components/com_admin/views/profile/tmpl/edit.php b/administrator/components/com_admin/views/profile/tmpl/edit.php
index 0e9d8f8f4b785..7e7c15d950dc3 100644
--- a/administrator/components/com_admin/views/profile/tmpl/edit.php
+++ b/administrator/components/com_admin/views/profile/tmpl/edit.php
@@ -55,7 +55,7 @@
continue;
}
?>
- name, JText::_($fieldset->label)); ?>
+ name, JText::_($fieldset->label, true)); ?>
form->getFieldset($fieldset->name) as $field) : ?>
hidden) : ?>
diff --git a/administrator/components/com_banners/models/banner.php b/administrator/components/com_banners/models/banner.php
index 866885bfafbc9..16e3b8e6cbe87 100644
--- a/administrator/components/com_banners/models/banner.php
+++ b/administrator/components/com_banners/models/banner.php
@@ -473,27 +473,6 @@ protected function prepareTable($table)
$table->version++;
}
- /**
- * Allows preprocessing of the JForm object.
- *
- * @param JForm $form The form object
- * @param array $data The data to be merged into the form object
- * @param string $group The plugin group to be executed
- *
- * @return void
- *
- * @since 3.6.1
- */
- protected function preprocessForm(JForm $form, $data, $group = 'content')
- {
- if ($this->canCreateCategory())
- {
- $form->setFieldAttribute('catid', 'allowAdd', 'true');
- }
-
- parent::preprocessForm($form, $data, $group);
- }
-
/**
* Method to save the form data.
*
@@ -519,7 +498,7 @@ public function save($data)
}
// Save New Category
- if ($catid == 0 && $this->canCreateCategory())
+ if ($catid == 0)
{
$table = array();
$table['title'] = $data['catid'];
@@ -558,16 +537,4 @@ public function save($data)
return parent::save($data);
}
-
- /**
- * Is the user allowed to create an on the fly category?
- *
- * @return bool
- *
- * @since 3.6.1
- */
- private function canCreateCategory()
- {
- return JFactory::getUser()->authorise('core.create', 'com_banners');
- }
}
diff --git a/administrator/components/com_banners/models/forms/banner.xml b/administrator/components/com_banners/models/forms/banner.xml
index c7aad291da185..8a8dac3b9e32a 100644
--- a/administrator/components/com_banners/models/forms/banner.xml
+++ b/administrator/components/com_banners/models/forms/banner.xml
@@ -39,6 +39,7 @@
extension="com_banners"
required="true"
addfieldpath="/administrator/components/com_categories/models/fields"
+ allowAdd="true"
default=""
/>
@@ -92,7 +93,7 @@
description="COM_BANNERS_FIELD_DESCRIPTION_DESC"
filter="JComponentHelper::filterText"
buttons="true"
- hide="readmore,pagebreak,module"
+ hide="readmore,pagebreak"
/>
getModel('cache');
+ $data = $model->getCache()->getAll();
$allCleared = true;
- $clients = array(1, 0);
- foreach ($clients as $client)
+ foreach ($data as $cache)
{
- $mCache = $model->getCache($client);
- $clientStr = JText::_($client ? 'JADMINISTRATOR' : 'JSITE') .' > ';
-
- foreach ($mCache->getAll() as $cache)
+ if ((int) $model->clean($cache->group) !== 1)
{
- if ((int) $mCache->clean($cache->group) !== 1)
- {
- $app->enqueueMessage(JText::sprintf('COM_CACHE_EXPIRED_ITEMS_DELETE_ERROR', $clientStr . $cache->group), 'error');
- $allCleared = false;
- }
+ $app->enqueueMessage(JText::sprintf('COM_CACHE_EXPIRED_ITEMS_DELETE_ERROR', $cache->group), 'error');
+ $allCleared = false;
}
}
diff --git a/administrator/components/com_cache/models/cache.php b/administrator/components/com_cache/models/cache.php
index fd8b6b2e76ef7..534c386ffe933 100644
--- a/administrator/components/com_cache/models/cache.php
+++ b/administrator/components/com_cache/models/cache.php
@@ -165,20 +165,15 @@ public function getData()
*
* @return object
*/
- public function getCache($client_id = null)
+ public function getCache()
{
$conf = JFactory::getConfig();
- if (is_null($client_id))
- {
- $client_id = $this->getState('client_id');
- }
-
$options = array(
'defaultgroup' => '',
'storage' => $conf->get('cache_handler', ''),
'caching' => true,
- 'cachebase' => (int) $client_id === 1 ? JPATH_ADMINISTRATOR . '/cache' : $conf->get('cache_path', JPATH_SITE . '/cache')
+ 'cachebase' => ($this->getState('client_id') === 1) ? JPATH_ADMINISTRATOR . '/cache' : $conf->get('cache_path', JPATH_SITE . '/cache')
);
$cache = JCache::getInstance('', $options);
diff --git a/administrator/components/com_categories/helpers/categories.php b/administrator/components/com_categories/helpers/categories.php
index ec29ffc3f914d..e4589f6704bbd 100644
--- a/administrator/components/com_categories/helpers/categories.php
+++ b/administrator/components/com_categories/helpers/categories.php
@@ -148,7 +148,7 @@ public static function createCategory($data)
JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/models');
JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/tables');
- $categoryModel = JModelLegacy::getInstance('Category', 'CategoriesModel', array('ignore_request' => true));
+ $categoryModel = JModelLegacy::getInstance('Category', 'CategoriesModel');
$categoryModel->save($data);
$catid = $categoryModel->getState('category.id');
diff --git a/administrator/components/com_categories/models/categories.php b/administrator/components/com_categories/models/categories.php
index 6a2045ad33e2c..ec1246bd62d79 100644
--- a/administrator/components/com_categories/models/categories.php
+++ b/administrator/components/com_categories/models/categories.php
@@ -294,7 +294,7 @@ protected function getListQuery()
uc.name,
ag.title,
ua.name'
- );
+ );
return $query;
}
@@ -360,7 +360,7 @@ public function getItems()
/**
* Method to load the countItems method from the extensions
- *
+ *
* @param stdClass[] &$items The category items
* @param string $extension The category extension
*
@@ -387,12 +387,12 @@ public function countItems(&$items, $extension)
{
require_once $file;
- $prefix = ucfirst($eName);
+ $prefix = ucfirst(str_replace('com_', '', $component));
$cName = $prefix . 'Helper';
if (class_exists($cName) && is_callable(array($cName, 'countItems')))
{
- $cName::countItems($items, $section);
+ call_user_func(array($cName, 'countItems'), $items, $section);
}
}
}
diff --git a/administrator/components/com_categories/models/category.php b/administrator/components/com_categories/models/category.php
index fb63bb8bb2f13..44d3d4c4df45b 100644
--- a/administrator/components/com_categories/models/category.php
+++ b/administrator/components/com_categories/models/category.php
@@ -69,12 +69,15 @@ public function __construct($config = array())
*/
protected function canDelete($record)
{
- if (empty($record->id) || $record->published != -2)
+ if (!empty($record->id))
{
- return false;
- }
+ if ($record->published != -2)
+ {
+ return;
+ }
- return JFactory::getUser()->authorise('core.delete', $record->extension . '.category.' . (int) $record->id);
+ return JFactory::getUser()->authorise('core.delete', $record->extension . '.category.' . (int) $record->id);
+ }
}
/**
@@ -335,10 +338,7 @@ protected function loadFormData()
)
);
$data->set('language', $app->input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
- $data->set(
- 'access',
- $app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : JFactory::getConfig()->get('access')))
- );
+ $data->set('access', $app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : JFactory::getConfig()->get('access'))));
}
}
diff --git a/administrator/components/com_categories/models/fields/categoryedit.php b/administrator/components/com_categories/models/fields/categoryedit.php
index f1db512ea4448..ad352f6d0083e 100644
--- a/administrator/components/com_categories/models/fields/categoryedit.php
+++ b/administrator/components/com_categories/models/fields/categoryedit.php
@@ -23,7 +23,7 @@ class JFormFieldCategoryEdit extends JFormFieldList
/**
* To allow creation of new categories.
*
- * @var integer
+ * @var int
* @since 3.6
*/
protected $allowAdd;
@@ -251,8 +251,8 @@ protected function getOptions()
{
foreach ($options as $i => $option)
{
- /*
- * To take save or create in a category you need to have create rights for that category unless the item is already in that category.
+ /* To take save or create in a category you need to have create rights for that category
+ * unless the item is already in that category.
* Unset the option if the user isn't authorised for it. In this field assets are always categories.
*/
if ($user->authorise('core.create', $extension . '.category.' . $option->value) != true && $option->level != 0)
@@ -264,8 +264,7 @@ protected function getOptions()
// If you have an existing category id things are more complex.
else
{
- /*
- * If you are only allowed to edit in this category but not edit.state, you should not get any
+ /* If you are only allowed to edit in this category but not edit.state, you should not get any
* option to change the category parent for a category or the category for a content item,
* but you should be able to save in that category.
*/
@@ -286,10 +285,8 @@ protected function getOptions()
unset($options[$i]);
}
- /*
- * However, if you can edit.state you can also move this to another category for which you have
- * create permission and you should also still be able to save in the current category.
- */
+ // However, if you can edit.state you can also move this to another category for which you have
+ // create permission and you should also still be able to save in the current category.
if (($user->authorise('core.create', $extension . '.category.' . $option->value) != true)
&& ($option->value != $oldCat && !isset($oldParent)))
{
@@ -365,10 +362,7 @@ protected function getInput()
$attr .= $this->autofocus ? ' autofocus' : '';
// To avoid user's confusion, readonly="true" should imply disabled="true".
- if ((string) $this->readonly == '1'
- || (string) $this->readonly == 'true'
- || (string) $this->disabled == '1'
- || (string) $this->disabled == 'true')
+ if ((string) $this->readonly == '1' || (string) $this->readonly == 'true' || (string) $this->disabled == '1'|| (string) $this->disabled == 'true')
{
$attr .= ' disabled="disabled"';
}
diff --git a/administrator/components/com_categories/models/fields/categoryparent.php b/administrator/components/com_categories/models/fields/categoryparent.php
index bbb4954f7e81a..438a663a931a5 100644
--- a/administrator/components/com_categories/models/fields/categoryparent.php
+++ b/administrator/components/com_categories/models/fields/categoryparent.php
@@ -133,8 +133,8 @@ protected function getOptions()
{
foreach ($options as $i => $option)
{
- /*
- * To take save or create in a category you need to have create rights for that category unless the item is already in that category.
+ /* To take save or create in a category you need to have create rights for that category
+ * unless the item is already in that category.
* Unset the option if the user isn't authorised for it. In this field assets are always categories.
*/
if ($user->authorise('core.create', $extension . '.category.' . $option->value) != true)
@@ -148,8 +148,7 @@ protected function getOptions()
{
foreach ($options as $i => $option)
{
- /*
- * If you are only allowed to edit in this category but not edit.state, you should not get any
+ /* If you are only allowed to edit in this category but not edit.state, you should not get any
* option to change the category parent for a category or the category for a content item,
* but you should be able to save in that category.
*/
@@ -161,10 +160,8 @@ protected function getOptions()
unset($options[$i]);
}
}
- /*
- * However, if you can edit.state you can also move this to another category for which you have
- * create permission and you should also still be able to save in the current category.
- */
+ // However, if you can edit.state you can also move this to another category for which you have
+ // create permission and you should also still be able to save in the current category.
elseif (($user->authorise('core.create', $extension . '.category.' . $option->value) != true)
&& $option->value != $oldCat
)
diff --git a/administrator/components/com_categories/views/category/tmpl/edit_associations.php b/administrator/components/com_categories/views/category/tmpl/edit_associations.php
index b8751b02e7143..ecb71eb489e61 100644
--- a/administrator/components/com_categories/views/category/tmpl/edit_associations.php
+++ b/administrator/components/com_categories/views/category/tmpl/edit_associations.php
@@ -9,4 +9,11 @@
defined('_JEXEC') or die;
-echo JLayoutHelper::render('joomla.edit.associations', $this);
+if ($this->item->id != 0 && $this->item->language != '*')
+{
+ echo JLayoutHelper::render('joomla.edit.associations', $this);
+}
+else
+{
+ echo '
' . JText::_('JGLOBAL_ASSOC_NOT_POSSIBLE') . '
';
+}
diff --git a/administrator/components/com_categories/views/category/view.html.php b/administrator/components/com_categories/views/category/view.html.php
index 6ca4f8ca972fe..4439dae47bd27 100644
--- a/administrator/components/com_categories/views/category/view.html.php
+++ b/administrator/components/com_categories/views/category/view.html.php
@@ -142,9 +142,7 @@ protected function addToolbar()
// Else if the component section string exits, let's use it
elseif ($lang->hasKey($component_section_key = $component . ($section ? "_$section" : '')))
{
- $title = JText::sprintf('COM_CATEGORIES_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT')
- . '_TITLE', $this->escape(JText::_($component_section_key))
- );
+ $title = JText::sprintf('COM_CATEGORIES_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT') . '_TITLE', $this->escape(JText::_($component_section_key)));
}
// Else use the base title
else
@@ -206,19 +204,13 @@ protected function addToolbar()
JToolbarHelper::divider();
- // Compute the ref_key
- $ref_key = strtoupper($component . ($section ? "_$section" : '')) . '_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT') . '_HELP_KEY';
-
- // Check if thr computed ref_key does exist in the component
- if (!$lang->hasKey($ref_key))
+ // Compute the ref_key if it does exist in the component
+ if (!$lang->hasKey($ref_key = strtoupper($component . ($section ? "_$section" : '')) . '_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT') . '_HELP_KEY'))
{
- $ref_key = 'JHELP_COMPONENTS_'
- . strtoupper(substr($component, 4) . ($section ? "_$section" : ''))
- . '_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT');
+ $ref_key = 'JHELP_COMPONENTS_' . strtoupper(substr($component, 4) . ($section ? "_$section" : '')) . '_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT');
}
- /*
- * Get help for the category/section view for the component by
+ /* Get help for the category/section view for the component by
* -remotely searching in a language defined dedicated URL: *component*_HELP_URL
* -locally searching in a component help file if helpURL param exists in the component and is set to ''
* -remotely searching in a component URL if helpURL param exists in the component and is NOT set to ''
diff --git a/administrator/components/com_checkin/models/checkin.php b/administrator/components/com_checkin/models/checkin.php
index c9a08970919d8..323bdb90e2e33 100644
--- a/administrator/components/com_checkin/models/checkin.php
+++ b/administrator/components/com_checkin/models/checkin.php
@@ -238,7 +238,6 @@ public function getItems()
// Pagination
$limit = (int) $this->getState('list.limit');
-
if ($limit !== 0)
{
$this->items = array_slice($results, $this->getState('list.start'), $limit);
diff --git a/administrator/components/com_config/model/application.php b/administrator/components/com_config/model/application.php
index 5f6649b1d6278..41057f18f49e3 100644
--- a/administrator/components/com_config/model/application.php
+++ b/administrator/components/com_config/model/application.php
@@ -127,16 +127,7 @@ public function save($data)
$host = JUri::getInstance()->getHost();
$options = new \Joomla\Registry\Registry;
$options->set('userAgent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:41.0) Gecko/20100101 Firefox/41.0');
-
- // Do not check for valid server certificate here, leave this to the user, moreover disable using a proxy if any is configured.
- $options->set('transport.curl',
- array(
- CURLOPT_SSL_VERIFYPEER => false,
- CURLOPT_SSL_VERIFYHOST => false,
- CURLOPT_PROXY => null,
- CURLOPT_PROXYUSERPWD => null,
- )
- );
+ $options->set('transport.curl', array(CURLOPT_SSL_VERIFYPEER => false));
$response = JHttpFactory::getHttp($options)->get('https://' . $host . JUri::root(true) . '/', array('Host' => $host), 10);
// If available in HTTPS check also the status code.
diff --git a/administrator/components/com_contact/helpers/contact.php b/administrator/components/com_contact/helpers/contact.php
index 34c1e264d952a..8b55524bcbafd 100644
--- a/administrator/components/com_contact/helpers/contact.php
+++ b/administrator/components/com_contact/helpers/contact.php
@@ -43,7 +43,7 @@ public static function addSubmenu($vName)
/**
* Adds Count Items for Category Manager.
*
- * @param stdClass[] &$items The contact category objects
+ * @param stdClass[] &$items The banner category objects
*
* @return stdClass[]
*
diff --git a/administrator/components/com_contact/models/contact.php b/administrator/components/com_contact/models/contact.php
index 9783c5b62e140..a53da18198dcb 100644
--- a/administrator/components/com_contact/models/contact.php
+++ b/administrator/components/com_contact/models/contact.php
@@ -396,7 +396,7 @@ public function save($data)
}
// Save New Category
- if ($catid == 0 && $this->canCreateCategory())
+ if ($catid == 0)
{
$table = array();
$table['title'] = $data['catid'];
@@ -512,28 +512,9 @@ protected function getReorderConditions($table)
* @param string $group Group name.
*
* @return void
- *
- * @since 3.0.3
*/
protected function preprocessForm(JForm $form, $data, $group = 'content')
{
- // Determine correct permissions to check.
- if ($this->getState('contact.id'))
- {
- // Existing record. Can only edit in selected categories.
- $form->setFieldAttribute('catid', 'action', 'core.edit');
- }
- else
- {
- // New record. Can only create in selected categories.
- $form->setFieldAttribute('catid', 'action', 'core.create');
- }
-
- if ($this->canCreateCategory())
- {
- $form->setFieldAttribute('catid', 'allowAdd', 'true');
- }
-
// Association content items
$assoc = JLanguageAssociations::isEnabled();
@@ -652,16 +633,4 @@ protected function generateNewTitle($category_id, $alias, $name)
return array($name, $alias);
}
-
- /**
- * Is the user allowed to create an on the fly category?
- *
- * @return bool
- *
- * @since 3.6.1
- */
- private function canCreateCategory()
- {
- return JFactory::getUser()->authorise('core.create', 'com_contact');
- }
}
diff --git a/administrator/components/com_contact/models/forms/contact.xml b/administrator/components/com_contact/models/forms/contact.xml
index 3aa3bd386037f..f21b7307d01d0 100644
--- a/administrator/components/com_contact/models/forms/contact.xml
+++ b/administrator/components/com_contact/models/forms/contact.xml
@@ -75,6 +75,7 @@
description="JFIELD_CATEGORY_DESC"
extension="com_contact"
required="true"
+ allowAdd="true"
default=""
/>
diff --git a/administrator/components/com_contact/views/contact/tmpl/edit_associations.php b/administrator/components/com_contact/views/contact/tmpl/edit_associations.php
index a01793eee3932..70d2b1db61b28 100644
--- a/administrator/components/com_contact/views/contact/tmpl/edit_associations.php
+++ b/administrator/components/com_contact/views/contact/tmpl/edit_associations.php
@@ -9,4 +9,11 @@
defined('_JEXEC') or die;
-echo JLayoutHelper::render('joomla.edit.associations', $this);
+if ($this->item->id != 0 && $this->item->language != '*')
+{
+ echo JLayoutHelper::render('joomla.edit.associations', $this);
+}
+else
+{
+ echo '
' . JText::_('JGLOBAL_ASSOC_NOT_POSSIBLE') . '
';
+}
diff --git a/administrator/components/com_content/controllers/article.php b/administrator/components/com_content/controllers/article.php
index 077c82c63160d..c633d649a11b5 100644
--- a/administrator/components/com_content/controllers/article.php
+++ b/administrator/components/com_content/controllers/article.php
@@ -86,12 +86,6 @@ protected function allowEdit($data = array(), $key = 'id')
$user = JFactory::getUser();
$userId = $user->get('id');
- // If we get a deny at the component level, we cannot override here.
- if (!parent::allowEdit($data, $key))
- {
- return false;
- }
-
// Check general edit permission first.
if ($user->authorise('core.edit', 'com_content.article.' . $recordId))
{
@@ -104,7 +98,6 @@ protected function allowEdit($data = array(), $key = 'id')
{
// Now test the owner is the user.
$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-
if (empty($ownerId) && $recordId)
{
// Need to do a lookup from the model.
@@ -118,14 +111,15 @@ protected function allowEdit($data = array(), $key = 'id')
$ownerId = $record->created_by;
}
- // If the owner matches 'me' then permission is granted.
+ // If the owner matches 'me' then do the test.
if ($ownerId == $userId)
{
return true;
}
}
- return false;
+ // Since there is no asset tracking, revert to the component permissions.
+ return parent::allowEdit($data, $key);
}
/**
diff --git a/administrator/components/com_content/models/article.php b/administrator/components/com_content/models/article.php
index e062ed0d586c2..01656c6429418 100644
--- a/administrator/components/com_content/models/article.php
+++ b/administrator/components/com_content/models/article.php
@@ -241,7 +241,7 @@ protected function prepareTable($table)
// Reorder the articles within the category so the new article is first
if (empty($table->id))
{
- $table->reorder('catid = ' . (int) $table->catid . ' AND state >= 0');
+ $table->ordering = $table->getNextOrder('catid = ' . (int) $table->catid . ' AND state >= 0');
}
}
@@ -504,8 +504,8 @@ public function save($data)
$catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_content');
}
- // Save New Categoryg
- if ($catid == 0 && $this->canCreateCategory())
+ // Save New Category
+ if ($catid == 0)
{
$table = array();
$table['title'] = $data['catid'];
@@ -672,10 +672,12 @@ public function featured($pks, $value = 0)
// Featuring.
$tuples = array();
+ $ordering = $table->getNextOrder();
foreach ($new_featured as $pk)
{
- $tuples[] = $pk . ', 0';
+ $tuples[] = $pk . ', ' . $ordering;
+ $ordering++;
}
if (count($tuples))
@@ -698,8 +700,6 @@ public function featured($pks, $value = 0)
return false;
}
- $table->reorder();
-
$this->cleanCache();
return true;
@@ -723,7 +723,9 @@ protected function getReorderConditions($table)
}
/**
- * Allows preprocessing of the JForm object.
+ * Auto-populate the model state.
+ *
+ * Note. Calling getState in this method will result in recursion.
*
* @param JForm $form The form object
* @param array $data The data to be merged into the form object
@@ -735,12 +737,8 @@ protected function getReorderConditions($table)
*/
protected function preprocessForm(JForm $form, $data, $group = 'content')
{
- if ($this->canCreateCategory())
- {
- $form->setFieldAttribute('catid', 'allowAdd', 'true');
- }
-
// Association content items
+ $app = JFactory::getApplication();
$assoc = JLanguageAssociations::isEnabled();
if ($assoc)
@@ -811,16 +809,4 @@ public function hit()
{
return;
}
-
- /**
- * Is the user allowed to create an on the fly category?
- *
- * @return bool
- *
- * @since 3.6.1
- */
- private function canCreateCategory()
- {
- return JFactory::getUser()->authorise('core.create', 'com_content');
- }
}
diff --git a/administrator/components/com_content/models/forms/article.xml b/administrator/components/com_content/models/forms/article.xml
index 796fb16005472..e3d3df72a2914 100644
--- a/administrator/components/com_content/models/forms/article.xml
+++ b/administrator/components/com_content/models/forms/article.xml
@@ -47,6 +47,7 @@
label="JCATEGORY"
description="JFIELD_CATEGORY_DESC"
required="true"
+ allowAdd="true"
default=""
>
diff --git a/administrator/components/com_content/views/article/tmpl/edit_associations.php b/administrator/components/com_content/views/article/tmpl/edit_associations.php
index e65a294fdea1c..5da88c15516b0 100644
--- a/administrator/components/com_content/views/article/tmpl/edit_associations.php
+++ b/administrator/components/com_content/views/article/tmpl/edit_associations.php
@@ -9,4 +9,11 @@
defined('_JEXEC') or die;
-echo JLayoutHelper::render('joomla.edit.associations', $this);
+if ($this->item->id != 0 && $this->item->language != '*')
+{
+ echo JLayoutHelper::render('joomla.edit.associations', $this);
+}
+else
+{
+ echo '
' . JText::_('JGLOBAL_ASSOC_NOT_POSSIBLE') . '
';
+}
diff --git a/administrator/components/com_contenthistory/helpers/contenthistory.php b/administrator/components/com_contenthistory/helpers/contenthistory.php
index f18da818c0fcd..e35a8033d4591 100644
--- a/administrator/components/com_contenthistory/helpers/contenthistory.php
+++ b/administrator/components/com_contenthistory/helpers/contenthistory.php
@@ -260,7 +260,7 @@ public static function loadLanguageFiles($typeAlias)
$lang->load($component, JPATH_ADMINISTRATOR, null, false, true)
|| $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component), null, false, true);
- // Force loading of back-end global language file
+ // Force loading of backend global language file
$lang->load('joomla', JPath::clean(JPATH_ADMINISTRATOR), null, false, true);
}
}
diff --git a/administrator/components/com_finder/helpers/language.php b/administrator/components/com_finder/helpers/language.php
index a7bf2103fbdd1..47f6bfb05898b 100644
--- a/administrator/components/com_finder/helpers/language.php
+++ b/administrator/components/com_finder/helpers/language.php
@@ -95,7 +95,7 @@ public static function loadComponentLanguage()
}
/**
- * Method to load Smart Search plug-in language files.
+ * Method to load Smart Search plugin language files.
*
* @return void
*
@@ -113,7 +113,7 @@ public static function loadPluginLanguage()
$loaded = true;
- // Get array of all the enabled Smart Search plug-in names.
+ // Get array of all the enabled Smart Search plugin names.
$db = JFactory::getDbo();
$query = $db->getQuery(true)
->select('name')
@@ -133,7 +133,7 @@ public static function loadPluginLanguage()
$lang = JFactory::getLanguage();
$lang->load('plg_content_finder', JPATH_ADMINISTRATOR);
- // Load language file for each plug-in.
+ // Load language file for each plugin.
foreach ($plugins as $plugin)
{
$lang->load($plugin->name, JPATH_ADMINISTRATOR);
diff --git a/administrator/components/com_finder/models/index.php b/administrator/components/com_finder/models/index.php
index 152ae7e1524ee..608d2b99f3cdd 100644
--- a/administrator/components/com_finder/models/index.php
+++ b/administrator/components/com_finder/models/index.php
@@ -240,9 +240,9 @@ protected function getListQuery()
}
/**
- * Method to get the state of the Smart Search plug-ins.
+ * Method to get the state of the Smart Search plugins.
*
- * @return array Array of relevant plug-ins and whether they are enabled or not.
+ * @return array Array of relevant plugins and whether they are enabled or not.
*
* @since 2.5
*/
diff --git a/administrator/components/com_finder/views/index/view.html.php b/administrator/components/com_finder/views/index/view.html.php
index 70f8182690f12..b0448c7437c18 100644
--- a/administrator/components/com_finder/views/index/view.html.php
+++ b/administrator/components/com_finder/views/index/view.html.php
@@ -71,7 +71,7 @@ class FinderViewIndex extends JViewLegacy
*/
public function display($tpl = null)
{
- // Load plug-in language files.
+ // Load plugin language files.
FinderHelperLanguage::loadPluginLanguage();
$this->items = $this->get('Items');
diff --git a/administrator/components/com_finder/views/maps/view.html.php b/administrator/components/com_finder/views/maps/view.html.php
index e3bf2fe3e7a50..4e2c1cb305e8d 100644
--- a/administrator/components/com_finder/views/maps/view.html.php
+++ b/administrator/components/com_finder/views/maps/view.html.php
@@ -64,7 +64,7 @@ class FinderViewMaps extends JViewLegacy
*/
public function display($tpl = null)
{
- // Load plug-in language files.
+ // Load plugin language files.
FinderHelperLanguage::loadPluginLanguage();
// Load the view data.
diff --git a/administrator/components/com_installer/models/install.php b/administrator/components/com_installer/models/install.php
index 515deb1ef0589..8412cb9b576ff 100644
--- a/administrator/components/com_installer/models/install.php
+++ b/administrator/components/com_installer/models/install.php
@@ -193,7 +193,7 @@ public function install()
}
else
{
- // Package installed sucessfully.
+ // Package installed successfully.
$msg = JText::sprintf('COM_INSTALLER_INSTALL_SUCCESS', JText::_('COM_INSTALLER_TYPE_TYPE_' . strtoupper($package['type'])));
$result = true;
$msgType = 'message';
diff --git a/administrator/components/com_installer/models/languages.php b/administrator/components/com_installer/models/languages.php
index d28ce4e84efc8..3cd4661cfc8ca 100644
--- a/administrator/components/com_installer/models/languages.php
+++ b/administrator/components/com_installer/models/languages.php
@@ -30,7 +30,7 @@ class InstallerModelLanguages extends JModelList
private $updateSiteId = 0;
/**
- * Constructor override, defines a whitelist of column filters.
+ * Constructor override, defines a white list of column filters.
*
* @param array $config An optional associative array of configuration settings.
*
diff --git a/administrator/components/com_installer/models/manage.php b/administrator/components/com_installer/models/manage.php
index b4490328e0760..f5bb8238daa04 100644
--- a/administrator/components/com_installer/models/manage.php
+++ b/administrator/components/com_installer/models/manage.php
@@ -243,7 +243,7 @@ public function remove($eid = array())
continue;
}
- // Package uninstalled sucessfully
+ // Package uninstalled successfully
$msgs[] = JText::sprintf('COM_INSTALLER_UNINSTALL_SUCCESS', $rowtype);
$result = true;
diff --git a/administrator/components/com_installer/models/updatesites.php b/administrator/components/com_installer/models/updatesites.php
index a53d55c9f406f..9532dbb683880 100644
--- a/administrator/components/com_installer/models/updatesites.php
+++ b/administrator/components/com_installer/models/updatesites.php
@@ -361,7 +361,7 @@ public function rebuild()
}
else
{
- $app->enqueueMessage(JText::_('COM_INSTALLER_MSG_UPDATESITES_REBUILD_MESSAGE'), 'message');
+ $app->enqueueMessage(JText::_('COM_INSTALLER_MSG_UPDATESITES_REBUILD_WARNING'), 'warning');
}
}
diff --git a/administrator/components/com_joomlaupdate/controllers/update.php b/administrator/components/com_joomlaupdate/controllers/update.php
index c271d4a8b38f8..7e18a68bf49ac 100644
--- a/administrator/components/com_joomlaupdate/controllers/update.php
+++ b/administrator/components/com_joomlaupdate/controllers/update.php
@@ -25,8 +25,6 @@ class JoomlaupdateControllerUpdate extends JControllerLegacy
*/
public function download()
{
- JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
-
$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
$options['text_file'] = 'joomla_update.php';
JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
@@ -45,7 +43,7 @@ public function download()
if ($file)
{
JFactory::getApplication()->setUserState('com_joomlaupdate.file', $file);
- $url = 'index.php?option=com_joomlaupdate&task=update.install&' . JFactory::getSession()->getFormToken() . '=1';
+ $url = 'index.php?option=com_joomlaupdate&task=update.install';
JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_FILE', $file), JLog::INFO, 'Update');
}
else
@@ -67,8 +65,6 @@ public function download()
*/
public function install()
{
- JSession::checkToken('get') or jexit(JText::_('JINVALID_TOKEN'));
-
$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
$options['text_file'] = 'joomla_update.php';
JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
@@ -94,8 +90,6 @@ public function install()
*/
public function finalise()
{
- JSession::checkToken('get') or jexit(JText::_('JINVALID_TOKEN'));
-
$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
$options['text_file'] = 'joomla_update.php';
JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
@@ -107,7 +101,7 @@ public function finalise()
$model->finaliseUpgrade();
- $url = 'index.php?option=com_joomlaupdate&task=update.cleanup&' . JFactory::getSession()->getFormToken() . '=1';
+ $url = 'index.php?option=com_joomlaupdate&task=update.cleanup';
$this->setRedirect($url);
}
@@ -120,8 +114,6 @@ public function finalise()
*/
public function cleanup()
{
- JSession::checkToken('get') or jexit(JText::_('JINVALID_TOKEN'));
-
$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
$options['text_file'] = 'joomla_update.php';
JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
@@ -281,7 +273,7 @@ public function confirm()
JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_FILE', $tempFile), JLog::INFO, 'Update');
// Redirect to the actual update page
- $url = 'index.php?option=com_joomlaupdate&task=update.install&' . JFactory::getSession()->getFormToken() . '=1';
+ $url = 'index.php?option=com_joomlaupdate&task=update.install';
$this->setRedirect($url);
}
diff --git a/administrator/components/com_joomlaupdate/joomlaupdate.xml b/administrator/components/com_joomlaupdate/joomlaupdate.xml
index 85c467c9eaf35..71604e6a54547 100644
--- a/administrator/components/com_joomlaupdate/joomlaupdate.xml
+++ b/administrator/components/com_joomlaupdate/joomlaupdate.xml
@@ -7,7 +7,7 @@
GNU General Public License version 2 or later; see LICENSE.txtadmin@joomla.orgwww.joomla.org
- 3.6.2
+ 3.6.0COM_JOOMLAUPDATE_XML_DESCRIPTIONjs
diff --git a/administrator/components/com_joomlaupdate/models/default.php b/administrator/components/com_joomlaupdate/models/default.php
index e74f946daa241..4f9af0181bdf3 100644
--- a/administrator/components/com_joomlaupdate/models/default.php
+++ b/administrator/components/com_joomlaupdate/models/default.php
@@ -228,13 +228,13 @@ public function purge()
if ($db->execute())
{
- $this->_message = JText::_('COM_JOOMLAUPDATE_CHECKED_UPDATES');
+ $this->_message = JText::_('JLIB_INSTALLER_PURGED_UPDATES');
return true;
}
else
{
- $this->_message = JText::_('COM_JOOMLAUPDATE_FAILED_TO_CHECK_UPDATES');
+ $this->_message = JText::_('JLIB_INSTALLER_FAILED_TO_PURGE_UPDATES');
return false;
}
@@ -389,7 +389,7 @@ public function createRestorationFile($basename = null)
$ftp_host = $app->input->get('ftp_host', '');
$ftp_port = $app->input->get('ftp_port', '21');
$ftp_user = $app->input->get('ftp_user', '');
- $ftp_pass = addcslashes($app->input->get('ftp_pass', '', 'raw'), "'\\");
+ $ftp_pass = $app->input->get('ftp_pass', '', 'raw');
$ftp_root = $app->input->get('ftp_root', '');
// Is the tempdir really writable?
@@ -415,7 +415,7 @@ public function createRestorationFile($basename = null)
if (!$writable)
{
$FTPOptions = JClientHelper::getCredentials('ftp');
- $ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']);
+ $ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], null, $FTPOptions['user'], $FTPOptions['pass']);
$dest = JPath::clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $tempdir . '/admintools'), '/');
if (!@mkdir($tempdir . '/admintools'))
@@ -450,7 +450,7 @@ public function createRestorationFile($basename = null)
if (!is_writable($tempdir))
{
$FTPOptions = JClientHelper::getCredentials('ftp');
- $ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']);
+ $ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], null, $FTPOptions['user'], $FTPOptions['pass']);
$dest = JPath::clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $tempdir . '/admintools'), '/');
if (!@mkdir($tempdir . '/admintools'))
diff --git a/administrator/components/com_joomlaupdate/restore.php b/administrator/components/com_joomlaupdate/restore.php
index 1b5256508c05f..ae58f2d727161 100644
--- a/administrator/components/com_joomlaupdate/restore.php
+++ b/administrator/components/com_joomlaupdate/restore.php
@@ -6205,8 +6205,8 @@ class AKText extends AKAbstractObject
'RESTACLEANUP' => 'Restoration and Clean Up',
'BTN_RUNINSTALLER' => 'Run the Installer',
'BTN_CLEANUP' => 'Clean Up',
- 'BTN_SITEFE' => 'Visit your site\'s front-end',
- 'BTN_SITEBE' => 'Visit your site\'s back-end',
+ 'BTN_SITEFE' => 'Visit your site\'s frontend',
+ 'BTN_SITEBE' => 'Visit your site\'s backend',
'WARNINGS' => 'Extraction Warnings',
'ERROR_OCCURED' => 'An error occurred',
'STEALTH_MODE' => 'Stealth mode',
diff --git a/administrator/components/com_joomlaupdate/views/default/view.html.php b/administrator/components/com_joomlaupdate/views/default/view.html.php
index fae9731285134..a498dccad8224 100644
--- a/administrator/components/com_joomlaupdate/views/default/view.html.php
+++ b/administrator/components/com_joomlaupdate/views/default/view.html.php
@@ -72,7 +72,7 @@ public function display($tpl = null)
// Set the toolbar information.
JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'loop install');
- JToolbarHelper::custom('update.purge', 'loop', 'loop', 'COM_JOOMLAUPDATE_TOOLBAR_CHECK', false);
+ JToolbarHelper::custom('update.purge', 'purge', 'purge', 'JTOOLBAR_PURGE_CACHE', false);
// Add toolbar buttons.
$user = JFactory::getUser();
diff --git a/administrator/components/com_joomlaupdate/views/update/tmpl/default.php b/administrator/components/com_joomlaupdate/views/update/tmpl/default.php
index 5b5676e6d10b5..b0f45c0a6d26e 100644
--- a/administrator/components/com_joomlaupdate/views/update/tmpl/default.php
+++ b/administrator/components/com_joomlaupdate/views/update/tmpl/default.php
@@ -20,7 +20,7 @@
$password = JFactory::getApplication()->getUserState('com_joomlaupdate.password', null);
$filesize = JFactory::getApplication()->getUserState('com_joomlaupdate.filesize', null);
$ajaxUrl = JUri::base() . 'components/com_joomlaupdate/restore.php';
-$returnUrl = 'index.php?option=com_joomlaupdate&task=update.finalise&' . JFactory::getSession()->getFormToken() . '=1';
+$returnUrl = 'index.php?option=com_joomlaupdate&task=update.finalise';
JFactory::getDocument()->addScriptDeclaration(
"
diff --git a/administrator/components/com_media/models/manager.php b/administrator/components/com_media/models/manager.php
index e2b9598374f0e..15e8e9f37521d 100644
--- a/administrator/components/com_media/models/manager.php
+++ b/administrator/components/com_media/models/manager.php
@@ -106,7 +106,7 @@ public function getFolderList($base = null)
$author = $input->get('author', 0, 'integer');
- // Create the drop-down folder select list
+ // Create the dropdown folder select list
$attribs = 'size="1" onchange="ImageManager.setFolder(this.options[this.selectedIndex].value, ' . $asset . ', ' . $author . ')" ';
$list = JHtml::_('select.genericlist', $options, 'folderlist', $attribs, 'value', 'text', $base);
diff --git a/administrator/components/com_menus/controllers/menu.php b/administrator/components/com_menus/controllers/menu.php
index 068fd78652c19..8ef083144995f 100644
--- a/administrator/components/com_menus/controllers/menu.php
+++ b/administrator/components/com_menus/controllers/menu.php
@@ -63,7 +63,7 @@ public function save($key = null, $urlVar = null)
return false;
}
- // Prevent using 'menu' or 'main' as menutype as this is reserved for back-end menus
+ // Prevent using 'menu' or 'main' as menutype as this is reserved for backend menus
if (strtolower($data['menutype']) == 'menu' || strtolower($data['menutype']) == 'main')
{
$msg = JText::_('COM_MENUS_ERROR_MENUTYPE');
diff --git a/administrator/components/com_menus/models/fields/menuparent.php b/administrator/components/com_menus/models/fields/menuparent.php
index 13a94eefce7f1..6f247e912c7ae 100644
--- a/administrator/components/com_menus/models/fields/menuparent.php
+++ b/administrator/components/com_menus/models/fields/menuparent.php
@@ -43,7 +43,6 @@ protected function getOptions()
->from('#__menu AS a')
->join('LEFT', $db->quoteName('#__menu') . ' AS b ON a.lft > b.lft AND a.rgt < b.rgt');
- // Filter by menu type.
if ($menuType = $this->form->getValue('menutype'))
{
$query->where('a.menutype = ' . $db->quote($menuType));
@@ -53,14 +52,6 @@ protected function getOptions()
$query->where('a.menutype != ' . $db->quote(''));
}
- // Filter by client id.
- $clientId = $this->getAttribute('clientid');
-
- if (!is_null($clientId))
- {
- $query->where($db->quoteName('a.client_id') . ' = ' . (int) $clientId);
- }
-
// Prevent parenting to children of this item.
if ($id = $this->form->getValue('id'))
{
diff --git a/administrator/components/com_menus/models/forms/item.xml b/administrator/components/com_menus/models/forms/item.xml
index 70c5104e7bb1a..bb4b79469af69 100644
--- a/administrator/components/com_menus/models/forms/item.xml
+++ b/administrator/components/com_menus/models/forms/item.xml
@@ -3,14 +3,13 @@