Skip to content

[4.x] Fix default language value for taxonomy rows #43990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laoneo merged 4 commits into from
Aug 30, 2024
Merged

[4.x] Fix default language value for taxonomy rows #43990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c61e65b
fix default language value for taxonomy rows
SniperSister Aug 27, 2024
0120dfd
fix default value for other taxonomy methods
SniperSister Aug 28, 2024
3303c00
Merge branch '4.4-dev' into 4.4-finder-taxonomy-language
QuyTon Aug 29, 2024
6ca837f
Merge branch '4.4-dev' into 4.4-finder-taxonomy-language
laoneo Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions administrator/components/com_finder/src/Indexer/Result.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ public function getTaxonomy($branch = null)
*
* @since 2.5
*/
public function addTaxonomy($branch, $title, $state = 1, $access = 1, $language = '')
public function addTaxonomy($branch, $title, $state = 1, $access = 1, $language = '*')
{
// We can't add taxonomies with empty titles
if (!trim($title)) {
Expand Down Expand Up @@ -427,7 +427,7 @@ public function addTaxonomy($branch, $title, $state = 1, $access = 1, $language
*
* @since 4.0.0
*/
public function addNestedTaxonomy($branch, ImmutableNodeInterface $contentNode, $state = 1, $access = 1, $language = '')
public function addNestedTaxonomy($branch, ImmutableNodeInterface $contentNode, $state = 1, $access = 1, $language = '*')
{
// We can't add taxonomies with empty titles
if (!trim($contentNode->title)) {
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_finder/src/Indexer/Taxonomy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public static function addBranch($title, $state = 1, $access = 1)
$node->state = $state;
$node->access = $access;
$node->parent_id = 1;
$node->language = '';
$node->language = '*';

return self::storeNode($node, 1);
}
Expand All @@ -87,7 +87,7 @@ public static function addBranch($title, $state = 1, $access = 1)
* @since 2.5
* @throws \RuntimeException on database error.
*/
public static function addNode($branch, $title, $state = 1, $access = 1, $language = '')
public static function addNode($branch, $title, $state = 1, $access = 1, $language = '*')
{
// Get the branch id, insert it if it does not exist.
$branchId = static::addBranch($branch);
Expand Down Expand Up @@ -116,7 +116,7 @@ public static function addNode($branch, $title, $state = 1, $access = 1, $langua
*
* @since 4.0.0
*/
public static function addNestedNode($branch, NodeInterface $node, $state = 1, $access = 1, $language = '', $branchId = null)
public static function addNestedNode($branch, NodeInterface $node, $state = 1, $access = 1, $language = '*', $branchId = null)
{
if (!$branchId) {
// Get the branch id, insert it if it does not exist.
Expand Down