Merge branch '4.3-dev' into patch-54

administrator/components/com_guidedtours/src/Model/StepsModel.php

@@ -50,6 +50,7 @@ public function __construct($config = [])
                 'created_by', 'a.created_by',
                 'modified', 'a.modified',
                 'modified_by', 'a.modified_by',
+                'note', 'a.note',
             ];
         }
 
@@ -200,9 +201,10 @@ protected function getListQuery()
                 $search = '%' . str_replace(' ', '%', trim($search)) . '%';
                 $query->where(
                     '(' . $db->quoteName('a.title') . ' LIKE :search1'
-                    . ' OR ' . $db->quoteName('a.description') . ' LIKE :search2)'
+                    . ' OR ' . $db->quoteName('a.description') . ' LIKE :search2'
+                    . ' OR ' . $db->quoteName('a.note') . ' LIKE :search3)'
                 )
-                    ->bind([':search1', ':search2'], $search);
+                    ->bind([':search1', ':search2', ':search3'], $search);
             }
         }
 

administrator/components/com_guidedtours/src/Model/ToursModel.php

@@ -51,6 +51,7 @@ public function __construct($config = [])
                 'created_by', 'a.created_by',
                 'modified', 'a.modified',
                 'modified_by', 'a.modified_by',
+                'note', 'a.note',
             ];
         }
 
@@ -220,9 +221,10 @@ public function getListQuery()
                 $search = '%' . str_replace(' ', '%', trim($search)) . '%';
                 $query->where(
                     '(' . $db->quoteName('a.title') . ' LIKE :search1'
-                    . ' OR ' . $db->quoteName('a.description') . ' LIKE :search2)'
+                    . ' OR ' . $db->quoteName('a.description') . ' LIKE :search2'
+                    . ' OR ' . $db->quoteName('a.note') . ' LIKE :search3)'
                 )
-                    ->bind([':search1', ':search2'], $search);
+                    ->bind([':search1', ':search2', ':search3'], $search);
             }
         }
 

administrator/components/com_joomlaupdate/src/Controller/UpdateController.php

@@ -60,7 +60,7 @@ public function download()
         $message     = null;
         $messageType = null;
 
-        // The validation was not successful so abort.
+        // The validation was not successful so stop.
         if ($result['check'] === false) {
             $message     = Text::_('COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_WRONG');
             $messageType = 'error';

administrator/components/com_menus/presets/alternate.xml

@@ -349,6 +349,14 @@
 			permission="core.manage;com_joomlaupdate"
 		/>
 
+		<menuitem
+			title="MOD_MENU_MANAGE_GUIDEDTOURS"
+			type="component"
+			element="com_guidedtours"
+			link="index.php?option=com_guidedtours&amp;view=tours"
+			permission="core.manage;com_guidedtours"
+		/>
+
 		<menuitem
 			title="COM_POSTINSTALL"
 			type="component"

administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php

@@ -115,7 +115,7 @@ public function check()
             $this->metadesc = StringHelper::str_ireplace($bad_characters, '', $this->metadesc);
         }
 
-        if (is_null($this->hits)) {
+        if (!$this->hits) {
             $this->hits = 0;
         }
 

administrator/components/com_users/src/Model/MethodsModel.php

@@ -95,7 +95,7 @@ public function deleteAll(?User $user = null): void
             $user = Factory::getApplication()->getIdentity() ?: $this->getCurrentUser();
         }
 
-        // If the user object is a guest (who can't have MFA) we abort with an error
+        // If the user object is a guest (who can't have MFA) we stop with an error
         if ($user->guest) {
             throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }

administrator/language/en-GB/com_guidedtours.ini

@@ -20,7 +20,7 @@ COM_GUIDEDTOURS_FIELD_VALUE_INTERACTIVESTEP_TYPE_TEXT_FIELD="Text Field"
 COM_GUIDEDTOURS_FIELD_VALUE_STEP_TYPE_INTERACTIVE="Interactive"
 COM_GUIDEDTOURS_FIELD_VALUE_STEP_TYPE_NEXT="Next"
 COM_GUIDEDTOURS_FIELD_VALUE_STEP_TYPE_REDIRECT="Redirect"
-COM_GUIDEDTOURS_FILTER_SEARCH_DESC="Search in title. Prefix with ID: to search for a tour ID or DESCRIPTION: to search in description."
+COM_GUIDEDTOURS_FILTER_SEARCH_DESC="Search in title and note. Prefix with ID: to search for a tour ID or DESCRIPTION: to search in description."
 COM_GUIDEDTOURS_FILTER_SEARCH_LABEL="Search Tours"
 COM_GUIDEDTOURS_GUIDEDTOURS_TABLE_CAPTION="Tours"
 COM_GUIDEDTOURS_MANAGER_STEP_EDIT="Guided Tours: Edit Step"
@@ -44,7 +44,7 @@ COM_GUIDEDTOURS_ORDER_TYPE_ASC="Type ascending"
 COM_GUIDEDTOURS_ORDER_TYPE_DESC="Type descending"
 COM_GUIDEDTOURS_STEP_DESCRIPTION_TRANSLATION="Description (%s)"
 COM_GUIDEDTOURS_STEP_EDIT_STEP="Edit Step"
-COM_GUIDEDTOURS_STEP_FILTER_SEARCH_DESC="Search in title. Prefix with ID: to search for a step ID or DESCRIPTION: to search in description."
+COM_GUIDEDTOURS_STEP_FILTER_SEARCH_DESC="Search in title and note. Prefix with ID: to search for a step ID or DESCRIPTION: to search in description."
 COM_GUIDEDTOURS_STEP_FILTER_SEARCH_LABEL="Search Steps"
 COM_GUIDEDTOURS_STEP_NEW_STEP="New Step"
 COM_GUIDEDTOURS_STEP_POSITION_DESC="Select the position of the step popup, relative to the element it points to."

build/media_source/plg_installer_webinstaller/js/client.es6.js

@@ -404,7 +404,7 @@ customElements.whenDefined('joomla-tab').then(() => {
   const installerTabs = document.getElementById('myTab');
   const link = installerTabs.querySelector('button[aria-controls=web]');
 
-  // Abort if the IFW tab cannot be found
+  // Stop if the IFW tab cannot be found
   if (!link) {
     return;
   }

build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js

@@ -514,7 +514,7 @@
           event.preventDefault();
         }
 
-        // Escape is the abort keystroke (for any target element)
+        // Escape is the cancel keystroke (for any target element)
         if (event.keyCode === KEYCODE.ESC && item) {
           item.setAttribute('draggable', 'false');
           item.setAttribute('aria-grabbed', 'false');
@@ -573,7 +573,7 @@
         switchRowPositions(item, row);
       });
 
-      // dragend event to clean-up after drop or abort
+      // dragend event to clean-up after drop or cancelation
       // which fires whether or not the drop target was valid
       this.addEventListener('dragend', () => {
         if (item) {

libraries/src/Application/CMSApplication.php

@@ -269,7 +269,7 @@ function ($systemVariable) use ($input) {
             $input->set($systemVariable, null);
         }
 
-        // Abort when there are invalid variables
+        // Stop when there are invalid variables
         if ($invalidInputVariables) {
             throw new \RuntimeException('Invalid input, aborting application.');
         }

libraries/src/Console/FinderIndexCommand.php

@@ -317,7 +317,7 @@ private function purge()
         // Attempt to purge the index.
         $return = $model->purge();
 
-        // If unsuccessful then abort.
+        // If unsuccessful then stop.
         if (!$return) {
             $message = Text::_('FINDER_CLI_INDEX_PURGE_FAILED', $model->getError());
             $this->ioStyle->error($message);

libraries/src/Dispatcher/AbstractModuleDispatcher.php

@@ -62,7 +62,7 @@ public function dispatch()
 
         $displayData = $this->getLayoutData();
 
-        // Abort when display data is false
+        // Stop when display data is false
         if ($displayData === false) {
             return;
         }
@@ -94,7 +94,7 @@ public function dispatch()
      * Returns the layout data. This function can be overridden by subclasses to add more
      * attributes for the layout.
      *
-     * If false is returned, then it means that the dispatch process should be aborted.
+     * If false is returned, then it means that the dispatch process should be stopped.
      *
      * @return  array|false
      *

libraries/src/Document/HtmlDocument.php

@@ -449,7 +449,7 @@ public function addHeadLink($href, $relation, $relType = 'rel', $attribs = [])
      *
      * @since   1.7.0
      */
-    public function addFavicon($href, $type = 'image/vnd.microsoft.icon', $relation = 'shortcut icon')
+    public function addFavicon($href, $type = 'image/vnd.microsoft.icon', $relation = 'icon')
     {
         $href = str_replace('\\', '/', $href);
         $this->addHeadLink($href, $relation, 'rel', ['type' => $type]);

libraries/src/Installer/Adapter/LibraryAdapter.php

@@ -59,7 +59,7 @@ protected function checkExtensionInFilesystem()
                 // From this point we'll consider this an update
                 $this->setRoute('update');
             } else {
-                // Abort the install, no upgrade possible
+                // Stop the install, no upgrade possible
                 throw new \RuntimeException(Text::_('JLIB_INSTALLER_ABORT_LIB_INSTALL_ALREADY_INSTALLED'));
             }
         }

libraries/src/Schema/ChangeSet.php

@@ -232,7 +232,7 @@ public function getSchema()
     {
         $updateFiles = $this->getUpdateFiles();
 
-        // No schema files found - abort and return empty string
+        // No schema files found - stop and return empty string
         if (empty($updateFiles)) {
             return '';
         }

libraries/src/Table/ContentType.php

@@ -145,7 +145,7 @@ public function getContentTable()
                 $class = $tableInfo->special->class ?? 'Joomla\\CMS\\Table\\Table';
 
                 if (!class_implements($class, 'Joomla\\CMS\\Table\\TableInterface')) {
-                    // This isn't an instance of TableInterface. Abort.
+                    // This isn't an instance of TableInterface. Stop.
                     throw new \RuntimeException('Class must be an instance of Joomla\\CMS\\Table\\TableInterface');
                 }
 

plugins/system/actionlogs/actionlogs.php

@@ -269,7 +269,7 @@ public function onAfterRespond()
             $result = false;
         }
 
-        // Abort on failure
+        // Stop on failure
         if (!$result) {
             return;
         }

plugins/system/logrotation/logrotation.php

@@ -118,7 +118,7 @@ public function onAfterRender()
             $result = false;
         }
 
-        // Abort on failure
+        // Stop on failure
         if (!$result) {
             return;
         }

plugins/system/privacyconsent/privacyconsent.php

@@ -526,7 +526,7 @@ public function onAfterRender()
             $result = false;
         }
 
-        // Abort on failure
+        // Stop on failure
         if (!$result) {
             return;
         }

plugins/system/updatenotification/updatenotification.php

@@ -139,7 +139,7 @@ public function onAfterRender()
             $result = false;
         }
 
-        // Abort on failure
+        // Stop on failure
         if (!$result) {
             return;
         }