Skip to content

Commit 4c4f5b5

Browse files
pe7erpe7er
authored
Merge pull request #43542 from pe7er/5.2/upmerge/2024-05-27
[5.2] Upmerge 2024-05-27
2 parents 1548e30 + efeeb8f commit 4c4f5b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+77
-67
lines changed

‎administrator/components/com_finder/src/Indexer/Helper.php‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,16 @@ public static function addContentType($title, $mime = null)
254254
$db->setQuery($query);
255255
$db->execute();
256256

257+
// Cache the result
258+
$type = new \stdClass();
259+
$type->title = $title;
260+
$type->mime = $mime ?? '';
261+
$type->id = (int) $db->insertid();
262+
263+
$types[$title] = $type;
264+
257265
// Return the new id.
258-
return (int) $db->insertid();
266+
return $type->id;
259267
}
260268

261269
/**

‎installation/language/af-ZA/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Afrikaans (Suid-Afrika)</name>
44
<version>5.1.1</version>
5-
<creationDate>2024-04</creationDate>
5+
<creationDate>2024-05</creationDate>
66
<author>Afrikaans Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/ar-AA/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Arabic (اللغة العربية)</name>
44
<version>5.1.1</version>
5-
<creationDate>2024-04</creationDate>
5+
<creationDate>2024-05</creationDate>
66
<author>Dr. Ashraf Damra</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/be-BY/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Belarusian (Belarus)</name>
44
<version>5.1.1</version>
5-
<creationDate>2024-04</creationDate>
5+
<creationDate>2024-05</creationDate>
66
<author>Joomla Belarus Community</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/bg-BG/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Bulgarian (bg-BG)</name>
44
<version>5.1.1</version>
5-
<creationDate>2024-04</creationDate>
5+
<creationDate>2024-05</creationDate>
66
<author>Joomla! Bulgaria</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/ca-ES/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Catalan (ca-ES)</name>
44
<version>5.1.1</version>
5-
<creationDate>2024-04</creationDate>
5+
<creationDate>2024-05</creationDate>
66
<author>Catalan [ca-ES] Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/cs-CZ/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Czech (Čeština)</name>
44
<version>5.1.1</version>
5-
<creationDate>2024-04</creationDate>
5+
<creationDate>2024-05</creationDate>
66
<author>Czech Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/cy-GB/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Welsh (United Kingdom)</name>
44
<version>5.1.1</version>
5-
<creationDate>2024-04</creationDate>
5+
<creationDate>2024-05</creationDate>
66
<author>Joomla! Project - Welsh Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/da-DK/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Danish (Danmark)</name>
44
<version>5.1.1</version>
5-
<creationDate>2024-04</creationDate>
5+
<creationDate>2024-05</creationDate>
66
<author>Danish Translation Team (Transl.: Ronny Buelund)</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/el-GR/langmetadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Greek (el-GR)</name>
44
<version>5.1.1</version>
5-
<creationDate>2024-04</creationDate>
5+
<creationDate>2024-05</creationDate>
66
<author>Ομάδα Μετάφρασης: joomla. gr</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

0 commit comments

Comments
 (0)