diff --git a/.drone.yml b/.drone.yml index 35e557acd0aa8..de3758236c4e2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ pipeline: image: joomlaprojects/docker-phpcs commands: - echo $(date) - - /root/.composer/vendor/bin/phpcs --report=full --extensions=php -p --encoding=utf-8 --standard=build/phpcs/Joomla . + - /root/.composer/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php -p --standard=build/phpcs/Joomla . - echo $(date) restore-cache: diff --git a/administrator/components/com_admin/forms/profile.xml b/administrator/components/com_admin/forms/profile.xml index 77fb1bdce1082..e1daa6ed6a1c4 100644 --- a/administrator/components/com_admin/forms/profile.xml +++ b/administrator/components/com_admin/forms/profile.xml @@ -125,6 +125,7 @@ type="plugins" label="COM_ADMIN_USER_FIELD_EDITOR_LABEL" folder="editors" + useaccess="true" > diff --git a/administrator/components/com_contenthistory/Model/HistoryModel.php b/administrator/components/com_contenthistory/Model/HistoryModel.php index e808d3e8f6d4a..94f5055ce36b4 100644 --- a/administrator/components/com_contenthistory/Model/HistoryModel.php +++ b/administrator/components/com_contenthistory/Model/HistoryModel.php @@ -134,6 +134,12 @@ public function delete(&$pks) { if ($table->load($pk)) { + if ($table->keep_forever === "1") + { + unset($pks[$i]); + continue; + } + if ($this->canEdit($table)) { if (!$table->delete($pk)) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 352bdb0e983df..a340b1927de71 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -54,7 +54,7 @@ COM_CONFIG_FIELD_FILTERS_CUSTOM_BLACK_LIST="Custom Blacklist" COM_CONFIG_FIELD_FILTERS_NO_HTML="No HTML" COM_CONFIG_FIELD_FILTERS_NO_FILTER="No Filtering" COM_CONFIG_FIELD_FILTERS_WHITE_LIST="Whitelist" -COM_CONFIG_FRONTEDITING_LABEL="Mouse-over Edit Icons for" +COM_CONFIG_FRONTEDITING_LABEL="Inline Editing" COM_CONFIG_FRONTEDITING_MENUSANDMODULES="Modules & Menus" COM_CONFIG_FRONTEDITING_MODULES="Modules" COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force HTTPS" diff --git a/components/com_contact/Model/ContactModel.php b/components/com_contact/Model/ContactModel.php index c83ce8b00c056..a14e8c828e03f 100644 --- a/components/com_contact/Model/ContactModel.php +++ b/components/com_contact/Model/ContactModel.php @@ -152,6 +152,12 @@ protected function loadFormData() $data['language'] = Factory::getLanguage()->getTag(); } + // Add contact id to contact form data, so fields plugin can work properly + if (empty($data['catid'])) + { + $data['catid'] = $this->getItem()->catid; + } + $this->preprocessData('com_contact.contact', $data); return $data; diff --git a/components/com_content/View/Article/HtmlView.php b/components/com_content/View/Article/HtmlView.php index de3e568cea3cc..96043f115fbc5 100644 --- a/components/com_content/View/Article/HtmlView.php +++ b/components/com_content/View/Article/HtmlView.php @@ -198,7 +198,7 @@ public function display($tpl = null) if ($this->user->get('guest')) { $return = base64_encode(Uri::getInstance()); - $login_url_with_return = Route::_('index.php?option=com_users&return=' . $return); + $login_url_with_return = Route::_('index.php?option=com_users&view=login&return=' . $return); $app->enqueueMessage(Text::_('JERROR_ALERTNOAUTHOR'), 'notice'); $app->redirect($login_url_with_return, 403); } diff --git a/components/com_finder/View/Search/HtmlView.php b/components/com_finder/View/Search/HtmlView.php index 5726060cca0d1..eee22adeeab37 100644 --- a/components/com_finder/View/Search/HtmlView.php +++ b/components/com_finder/View/Search/HtmlView.php @@ -312,16 +312,24 @@ protected function prepareDocument($query) $explained = $this->escape(html_entity_decode(strip_tags($this->explained), ENT_QUOTES, 'UTF-8')); $this->document->setDescription($explained); } + elseif ($this->params->get('menu-meta_description')) + { + $this->document->setDescription($this->params->get('menu-meta_description')); + } // Configure the document meta-keywords. if (!empty($query->highlight)) { $this->document->setMetaData('keywords', implode(', ', $query->highlight)); } + elseif ($this->params->get('menu-meta_keywords')) + { + $this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords')); + } if ($this->params->get('robots')) { - $this->document->setMetaData('robots', $this->params->get('robots')); + $this->document->setMetadata('robots', $this->params->get('robots')); } // Check for OpenSearch diff --git a/components/com_tags/Model/TagModel.php b/components/com_tags/Model/TagModel.php index 6cc17b00eb00e..df481e8144688 100644 --- a/components/com_tags/Model/TagModel.php +++ b/components/com_tags/Model/TagModel.php @@ -99,9 +99,14 @@ public function getItems() { foreach ($items as $item) { - $explodedTypeAlias = explode('.', $item->type_alias); - $item->link = 'index.php?option=' . $explodedTypeAlias[0] . '&view=' . $explodedTypeAlias[1] . '&id=' - . $item->content_item_id . ':' . $item->core_alias; + $item->link = TagsHelperRoute::getItemRoute( + $item->content_item_id, + $item->core_alias, + $item->core_catid, + $item->core_language, + $item->type_alias, + $item->router + ); // Get display date switch ($this->state->params->get('tag_list_show_date')) diff --git a/components/com_tags/View/Tag/FeedView.php b/components/com_tags/View/Tag/FeedView.php index 7c81db4dbb88e..ed028beb0a72b 100644 --- a/components/com_tags/View/Tag/FeedView.php +++ b/components/com_tags/View/Tag/FeedView.php @@ -59,10 +59,6 @@ public function display($tpl = null) $title = $this->escape($item->core_title); $title = html_entity_decode($title, ENT_COMPAT, 'UTF-8'); - // URL link to tagged item - // Change to new routing once it is merged - $link = Route::_($item->link); - // Strip HTML from feed item description text $description = $item->core_body; $author = $item->core_created_by_alias ?: $item->author; @@ -71,7 +67,7 @@ public function display($tpl = null) // Load individual item creator class $feeditem = new FeedItem; $feeditem->title = $title; - $feeditem->link = $link; + $feeditem->link = Route::_($item->link); $feeditem->description = $description; $feeditem->date = $date; $feeditem->category = $title; diff --git a/components/com_tags/View/Tag/HtmlView.php b/components/com_tags/View/Tag/HtmlView.php index 43bc9530f4df7..a56d8dea28f65 100644 --- a/components/com_tags/View/Tag/HtmlView.php +++ b/components/com_tags/View/Tag/HtmlView.php @@ -182,16 +182,13 @@ public function display($tpl = null) { $itemElement->core_body = $itemElement->text; } - } - } - // Categories store the images differently so lets re-map it so the display is correct - if ($items && $items[0]->type_alias === 'com_content.category') - { - foreach ($items as $row) - { - $core_params = json_decode($row->core_params); - $row->core_images = json_encode(array('image_intro' => $core_params->image, 'image_intro_alt' => $core_params->image_alt)); + // Categories store the images differently so lets re-map it so the display is correct + if ($itemElement->type_alias === 'com_content.category') + { + $coreParams = json_decode($itemElement->core_params); + $itemElement->core_images = json_encode(array('image_intro' => $coreParams->image, 'image_intro_alt' => $coreParams->image_alt)); + } } } diff --git a/components/com_tags/tmpl/tag/default_items.php b/components/com_tags/tmpl/tag/default_items.php index bcdee63c6ed19..bcee3fa336093 100644 --- a/components/com_tags/tmpl/tag/default_items.php +++ b/components/com_tags/tmpl/tag/default_items.php @@ -28,8 +28,6 @@ $canEdit = $user->authorise('core.edit', 'com_tags'); $canCreate = $user->authorise('core.create', 'com_tags'); $canEditState = $user->authorise('core.edit.state', 'com_tags'); -$items = $this->items; -$n = count($this->items); ?>
params->get('show_headings') || $this->params->get('filter_field') || $this->params->get('show_pagination_limit')) : ?> @@ -66,26 +64,23 @@ - items === false || $n === 0) : ?> + items)) : ?>