From 20b335d9185bd7bd08008e7c8833a33e454a2033 Mon Sep 17 00:00:00 2001 From: David Jardin Date: Wed, 14 Aug 2019 00:46:59 +0200 Subject: [PATCH 1/3] Replace require_once call with Autoloader (#404) Allows the usage of a custom IndexerAdapter class using a JLoader override --- src/plugins/finder/weblinks/weblinks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/finder/weblinks/weblinks.php b/src/plugins/finder/weblinks/weblinks.php index 32de240..8dc5306 100644 --- a/src/plugins/finder/weblinks/weblinks.php +++ b/src/plugins/finder/weblinks/weblinks.php @@ -12,7 +12,7 @@ defined('JPATH_BASE') or die; use Joomla\Registry\Registry; // Load the base adapter. -require_once JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php'; +JLoader::register('FinderIndexerAdapter', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php'); /** * Smart Search adapter for Joomla Web Links. From f7519475f148b720800298ded3a8f6dd9b591f57 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Fri, 16 Aug 2019 15:52:52 +0200 Subject: [PATCH 2/3] Make it joomla 4 compatible (#362) --- .../components/com_weblinks/models/forms/weblink.xml | 1 + .../components/com_weblinks/tables/weblink.php | 9 ++++++--- .../components/com_weblinks/views/weblinks/view.html.php | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/administrator/components/com_weblinks/models/forms/weblink.xml b/src/administrator/components/com_weblinks/models/forms/weblink.xml index a708d40..5bebeb9 100644 --- a/src/administrator/components/com_weblinks/models/forms/weblink.xml +++ b/src/administrator/components/com_weblinks/models/forms/weblink.xml @@ -38,6 +38,7 @@ label="JCATEGORY" description="COM_WEBLINKS_FIELD_CATEGORY_DESC" extension="com_weblinks" + addfieldprefix="Joomla\Component\Categories\Administrator\Field" required="true" default="" /> diff --git a/src/administrator/components/com_weblinks/tables/weblink.php b/src/administrator/components/com_weblinks/tables/weblink.php index a4963fb..4cd90cc 100644 --- a/src/administrator/components/com_weblinks/tables/weblink.php +++ b/src/administrator/components/com_weblinks/tables/weblink.php @@ -38,8 +38,11 @@ class WeblinksTableWeblink extends JTable // Set the published column alias $this->setColumnAlias('published', 'state'); - JTableObserverTags::createObserver($this, array('typeAlias' => 'com_weblinks.weblink')); - JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_weblinks.weblink')); + if (version_compare(JVERSION, '4.0', '<' ) == 1) + { + JTableObserverTags::createObserver($this, array('typeAlias' => 'com_weblinks.weblink')); + JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_weblinks.weblink')); + } } /** @@ -194,6 +197,6 @@ class WeblinksTableWeblink extends JTable $this->metakey = implode(", ", $clean_keys); } - return true; + return parent::check(); } } diff --git a/src/administrator/components/com_weblinks/views/weblinks/view.html.php b/src/administrator/components/com_weblinks/views/weblinks/view.html.php index cc37c83..f97955f 100644 --- a/src/administrator/components/com_weblinks/views/weblinks/view.html.php +++ b/src/administrator/components/com_weblinks/views/weblinks/view.html.php @@ -93,7 +93,7 @@ class WeblinksViewWeblinks extends JViewLegacy $user = JFactory::getUser(); // Get the toolbar object instance - $bar = JToolBar::getInstance('toolbar'); + $bar = JToolbar::getInstance('toolbar'); JToolbarHelper::title(JText::_('COM_WEBLINKS_MANAGER_WEBLINKS'), 'link weblinks'); @@ -129,7 +129,7 @@ class WeblinksViewWeblinks extends JViewLegacy if ($user->authorise('core.create', 'com_weblinks') && $user->authorise('core.edit', 'com_weblinks') && $user->authorise('core.edit.state', 'com_weblinks')) { - JHtml::_('bootstrap.modal', 'collapseModal'); + JHtml::_('bootstrap.renderModal', 'collapseModal'); $title = JText::_('JTOOLBAR_BATCH'); // Instantiate a new JLayoutFile instance and render the batch button From 4f08aee68128ef204409c7c3365ad764eeaf0387 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Fri, 16 Aug 2019 18:00:35 +0100 Subject: [PATCH 3/3] Update JORobo to latest version --- composer.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/composer.lock b/composer.lock index b8ee76d..931efa5 100644 --- a/composer.lock +++ b/composer.lock @@ -1570,7 +1570,7 @@ "email": "puneet.kala@community.joomla.org" }, { - "name": "Javier Gómez", + "name": "Javier Gomez", "email": "javier.gomez@community.joomla.org" } ], @@ -1635,16 +1635,16 @@ }, { "name": "joomla-projects/jorobo", - "version": "0.7.0", + "version": "0.7.2", "source": { "type": "git", "url": "https://github.com/joomla-projects/jorobo.git", - "reference": "1386f7712e39f08a3c1722e514eebdd6d0580c62" + "reference": "9ed1190edab1e5f69286570e2ebdd451f6d15b01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-projects/jorobo/zipball/1386f7712e39f08a3c1722e514eebdd6d0580c62", - "reference": "1386f7712e39f08a3c1722e514eebdd6d0580c62", + "url": "https://api.github.com/repos/joomla-projects/jorobo/zipball/9ed1190edab1e5f69286570e2ebdd451f6d15b01", + "reference": "9ed1190edab1e5f69286570e2ebdd451f6d15b01", "shasum": "" }, "require": { @@ -1671,17 +1671,17 @@ "name": "Yves Hoppe", "email": "yves@compojoom.com" }, - { - "name": "Niels Braczek", - "email": "nbraczek@bsds.de" - }, { "name": "Niels Nübel", "email": "niels@niels-nuebel.de" + }, + { + "name": "Niels Braczek", + "email": "nbraczek@bsds.de" } ], "description": "Tools and Tasks based on Robo.li for Joomla Extension Development and Releases", - "time": "2017-08-24T01:24:32+00:00" + "time": "2019-08-16T16:56:45+00:00" }, { "name": "joomla-projects/selenium-server-standalone", @@ -1711,7 +1711,7 @@ "email": "sven.eisenschmidt@gmail.com" }, { - "name": "Javier Gómez", + "name": "Javier Gomez", "email": "javier.gomez@community.joomla.org" } ], @@ -2456,8 +2456,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "role": "lead", + "email": "sb@sebastian-bergmann.de" } ], "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", @@ -3334,8 +3334,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "Library that helps with managing the version number of Git-hosted PHP projects",