Skip to content

Commit

Permalink
Merge branch '5.2-dev' into accordion
Browse files Browse the repository at this point in the history
  • Loading branch information
@brianteeman
brianteeman authored May 30, 2024
2 parents 96e6018 + dfb572d commit ff21e79
Show file tree
Hide file tree
Showing 62 changed files with 85 additions and 71 deletions.
2 changes: 1 addition & 1 deletion administrator/components/com_admin/script.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3002,7 +3002,7 @@ private function migrateTinymceConfiguration(): bool
/**
* setup Guided Tours Unique Identifiers
*
* @return boolean True on success
* @return void
*
* @since 5.0.0
*/
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_categories/src/Model/CategoryModel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,8 @@ public function publish(&$pks, $value = 1)

return true;
}

return false;
}

/**
Expand Down
10 changes: 9 additions & 1 deletion administrator/components/com_finder/src/Indexer/Helper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,16 @@ public static function addContentType($title, $mime = null)
$db->setQuery($query);
$db->execute();

// Cache the result
$type = new \stdClass();
$type->title = $title;
$type->mime = $mime ?? '';
$type->id = (int) $db->insertid();

$types[$title] = $type;

// Return the new id.
return (int) $db->insertid();
return $type->id;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_languages/src/Model/OverridesModel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public function delete($cids)
/**
* Removes all of the cached strings from the table.
*
* @return boolean result of operation
* @return void|\RuntimeException
*
* @since 3.4.2
*/
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_menus/src/Controller/MenuController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ public function save($key = null, $urlVar = null)
$this->setRedirect(Route::_('index.php?option=com_menus&view=menus', false));
break;
}

return true;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_modules/src/Controller/ModuleController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public function save($key = null, $urlVar = null)
/**
* Method to get the other modules in the same position
*
* @return string The data for the Ajax request.
* @return void
*
* @since 3.6.3
*/
Expand Down Expand Up @@ -303,7 +303,7 @@ public function orderPosition()
} catch (\RuntimeException $e) {
$app->enqueueMessage($e->getMessage(), 'error');

return '';
return;
}

$orders2 = [];
Expand Down
2 changes: 1 addition & 1 deletion installation/language/af-ZA/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Afrikaans (Suid-Afrika)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Afrikaans Translation Team</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/ar-AA/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Arabic (اللغة العربية)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Dr. Ashraf Damra</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/be-BY/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Belarusian (Belarus)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla Belarus Community</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/bg-BG/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Bulgarian (bg-BG)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Bulgaria</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/ca-ES/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Catalan (ca-ES)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Catalan [ca-ES] Translation Team</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/cs-CZ/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Czech (Čeština)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Czech Translation Team</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/cy-GB/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Welsh (United Kingdom)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Project - Welsh Translation Team</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/da-DK/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Danish (Danmark)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Danish Translation Team (Transl.: Ronny Buelund)</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/el-GR/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Greek (el-GR)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Ομάδα Μετάφρασης: joomla. gr</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/en-AU/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>English (Australia)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Project</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/en-CA/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>English (Canada)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Project</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/en-NZ/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>English (New Zealand)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Project</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/en-US/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>English (United States)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Project</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/es-ES/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Spanish (es-ES)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Spanish [es-ES] Translation Team</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/et-EE/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Estonian</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Project</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/eu-ES/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Basque</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Basque Translation Team</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/fa-AF/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>فارسی (دری)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>JoomlaPersian Translation Team</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/fa-IR/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Persian (fa-IR)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Persian Translation Team: joomlafarsi.com</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/fi-FI/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Finnish (Finland)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Finnish translation team: Joomla.fi</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/fr-CA/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>French (Canada)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Project - French translation team</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/fr-FR/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>French (fr-FR)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Project - French translation team</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/he-IL/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Hebrew (Israel)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>פרוייקט ג'ומלה</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/hr-HR/joomla.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: Putanja nije mapa. Putanja: %2
JLIB_FORM_FIELD_INVALID="Neispravno polje:&#160"
JLIB_FORM_VALIDATE_FIELD_INVALID="Neispravno polje: %s"
JLIB_FORM_VALIDATE_FIELD_REQUIRED="Potrebno polje: %s"
JLIB_INSTALLER_ABORT="Zaustavljanje instalacije jezika: %s"
JLIB_INSTALLER_ABORT="Odustajanje od instalacije jezika: %s"
JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Dodatak %1$s: Nije uspjelo kreiranje direktorija: %2$s"
JLIB_INSTALLER_ABORT_NOINSTALLPATH="Instalacijska putanja ne postoji"
JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Paket %1$s: Došlo je do greške prilikom instalacije dodatka: %2$s."
Expand Down
2 changes: 1 addition & 1 deletion installation/language/hr-HR/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Croatian (Croatia)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Hrvatska team</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/hu-HU/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Hungarian (Magyar)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Magyarország</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/id-ID/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Bahasa Indonesia (id-ID)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Indonesia</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/it-IT/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Italiano (it-IT)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Project (Italian Translation Team)</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/ja-JP/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Japanese (Japan)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla!じゃぱん</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/ka-GE/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Georgian (Georgia)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Georgian Translation Team</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/kk-KZ/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Kazakh (Kazakhstan)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Sarvarov Akylkerey</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/ko-KR/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Korean (Republic of Korea)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! 프로젝트</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/lt-LT/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Lietuvių (lt-LT)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Oskaras Jankauskas</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/lv-LV/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Latvian (Latvia)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Projekts</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/mk-MK/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Macedonian (mk-MK)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Joomla! Project</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/nl-BE/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Dutch (Belgium)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Dutch (BE) translation team</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/nl-NL/langmetadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metafile client="installation">
<name>Dutch (nl-NL)</name>
<version>5.1.1</version>
<creationDate>2024-04</creationDate>
<creationDate>2024-05</creationDate>
<author>Dutch Translation Team</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
Expand Down
Loading

0 comments on commit ff21e79

Please sign in to comment.