From 084a2a705761f4a21d6e720c267600b92750b700 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 27 May 2024 04:45:17 +0000 Subject: [PATCH 1/2] "zrl" functionility is moved --- forumdirectory/forumdirectory.php | 5 ++--- groupdirectory/groupdirectory.php | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php index 114da1da..9c99d63f 100644 --- a/forumdirectory/forumdirectory.php +++ b/forumdirectory/forumdirectory.php @@ -8,7 +8,6 @@ * Note: Please use Group Directory instead */ -use Friendica\App; use Friendica\Content\Nav; use Friendica\Content\Pager; use Friendica\Content\Widget; @@ -16,8 +15,8 @@ use Friendica\Core\Hook; use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; -use Friendica\Model\Profile; use Friendica\Model\User; +use Friendica\Security\OpenWebAuth; global $forumdirectory_search; @@ -82,7 +81,7 @@ function forumdirectory_content() $gdirpath = ''; $dirurl = DI::config()->get('system', 'directory'); if (strlen($dirurl)) { - $gdirpath = Profile::zrl($dirurl, true); + $gdirpath = OpenWebAuth::zrl($dirurl, true); } $sql_extra = ''; diff --git a/groupdirectory/groupdirectory.php b/groupdirectory/groupdirectory.php index 6d562cdc..df4bbb33 100644 --- a/groupdirectory/groupdirectory.php +++ b/groupdirectory/groupdirectory.php @@ -13,8 +13,8 @@ use Friendica\Core\Hook; use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; -use Friendica\Model\Profile; use Friendica\Model\User; +use Friendica\Security\OpenWebAuth; global $groupdirectory_search; @@ -79,7 +79,7 @@ function groupdirectory_content() $gdirpath = ''; $dirurl = DI::config()->get('system', 'directory'); if (strlen($dirurl)) { - $gdirpath = Profile::zrl($dirurl, true); + $gdirpath = OpenWebAuth::zrl($dirurl, true); } $sql_extra = ''; -- 2.43.5 From 39247ca28f84ec25b49e41482b7e5ea91bdf8b21 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 29 May 2024 06:07:48 +0000 Subject: [PATCH 2/2] Function renamed --- forumdirectory/forumdirectory.php | 2 +- groupdirectory/groupdirectory.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php index 9c99d63f..9a155a00 100644 --- a/forumdirectory/forumdirectory.php +++ b/forumdirectory/forumdirectory.php @@ -81,7 +81,7 @@ function forumdirectory_content() $gdirpath = ''; $dirurl = DI::config()->get('system', 'directory'); if (strlen($dirurl)) { - $gdirpath = OpenWebAuth::zrl($dirurl, true); + $gdirpath = OpenWebAuth::getZrlUrl($dirurl, true); } $sql_extra = ''; diff --git a/groupdirectory/groupdirectory.php b/groupdirectory/groupdirectory.php index df4bbb33..615d7024 100644 --- a/groupdirectory/groupdirectory.php +++ b/groupdirectory/groupdirectory.php @@ -79,7 +79,7 @@ function groupdirectory_content() $gdirpath = ''; $dirurl = DI::config()->get('system', 'directory'); if (strlen($dirurl)) { - $gdirpath = OpenWebAuth::zrl($dirurl, true); + $gdirpath = OpenWebAuth::getZrlUrl($dirurl, true); } $sql_extra = ''; -- 2.43.5