changed: updated for Elgg 4.3

ColdTrick · Jul 26, 2022 · e159a5e · e159a5e
1 parent 4eabfd8
commit e159a5e
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # opensearch
 
-![Elgg 4.2](https://img.shields.io/badge/Elgg-4.2-green.svg)
+![Elgg 4.3](https://img.shields.io/badge/Elgg-4.3-green.svg)
 ![OpenSearch 1.1](https://img.shields.io/badge/OpenSearch-1.1-green.svg)
 [![Build Status](https://scrutinizer-ci.com/g/ColdTrick/opensearch/badges/build.png?b=master)](https://scrutinizer-ci.com/g/ColdTrick/opensearch/build-status/master)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/ColdTrick/opensearch/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/ColdTrick/opensearch/?branch=master)

diff --git a/classes/ColdTrick/OpenSearch/Export.php b/classes/ColdTrick/OpenSearch/Export.php
@@ -2,6 +2,8 @@
 
 namespace ColdTrick\OpenSearch;
 
+use Elgg\Database\QueryBuilder;
+
 class Export {
 
 	/**
@@ -247,11 +249,13 @@ public static function entityRelationshipsToObject(\Elgg\Hook $hook) {
 			return;
 		}
 
-		$relationships = get_entity_relationships($entity->guid);
-		if (empty($relationships)) {
-			return;
-		}
-
+		$relationships = elgg_get_relationships([
+			'batch' => true,
+			'wheres' => function(QueryBuilder $qb, $main_alias) use ($entity) {
+				return $qb->compare("{$main_alias}.guid_one", '=', $entity->guid, ELGG_VALUE_GUID);
+			}
+		]);
+
 		$result = [];
 		/* @var $relationship \ElggRelationship */
 		foreach ($relationships as $relationship) {
@@ -264,6 +268,10 @@ public static function entityRelationshipsToObject(\Elgg\Hook $hook) {
 			];
 		}
 
+		if (empty($result)) {
+			return;
+		}
+
 		$return = $hook->getValue();
 
 		if (!isset($return->relationships)) {

diff --git a/classes/ColdTrick/OpenSearch/Menus/Page.php b/classes/ColdTrick/OpenSearch/Menus/Page.php
@@ -19,7 +19,7 @@ public static function admin(\Elgg\Hook $hook) {
 			return;
 		}
 
-		$current_path = parse_url(current_page_url(), PHP_URL_PATH);
+		$current_path = parse_url(elgg_get_current_url(), PHP_URL_PATH);
 		$site_path = parse_url(elgg_get_site_url(), PHP_URL_PATH);
 		$parsed_path = substr($current_path, strlen($site_path));
 

diff --git a/classes/ColdTrick/OpenSearch/SearchParams.php b/classes/ColdTrick/OpenSearch/SearchParams.php
@@ -445,7 +445,7 @@ public function addEntityAccessFilter(int $user_guid = 0) {
 		}
 
 		// add acl filter
-		$access_array = get_access_array($user_guid);
+		$access_array = elgg_get_access_array($user_guid);
 		if (!empty($access_array)) {
 			$access_filter[]['terms']['access_id'] = $access_array;
 		}

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
 		"coldtrick/sniffs": "dev-master"
 	},
 	"conflict": {
-		"elgg/elgg": "<4.2"
+		"elgg/elgg": "<4.3"
 	},
 	"config": {
 		"allow-plugins": {

diff --git a/composer.lock b/composer.lock
diff --git a/views/default/opensearch/search/suggest.php b/views/default/opensearch/search/suggest.php
@@ -40,7 +40,7 @@
 
 $url = elgg_view('output/url', [
 	'text' => elgg_format_element('strong', [], $suggestion),
-	'href' => elgg_http_add_url_query_elements(current_page_url(), ['q' => $suggestion]),
+	'href' => elgg_http_add_url_query_elements(elgg_get_current_url(), ['q' => $suggestion]),
 ]);
 
 $query = elgg_format_element('i', [], $query);

diff --git a/views/default/opensearch/stats/indices.php b/views/default/opensearch/stats/indices.php
@@ -54,7 +54,7 @@
 	$title = elgg_view('output/url', [
 		'text' => elgg_echo('opensearch:stats:index:index', [$index]),
 		'href' => "#index_{$index}",
-		'rel' => 'toggle',
+		'class' => 'elgg-toggle',
 	]);
 
 	echo elgg_view_module('info', $title, $content);