Merge pull request '"zrl" functionility is moved' (#1507) from heluecht/friendica-addons:openwebauth into develop
Reviewed-on: #1507 Reviewed-by: Hypolite Petovan <hypolite@mrpetovan.com>
This commit is contained in:
commit
7f073ec520
|
@ -8,7 +8,6 @@
|
||||||
* Note: Please use Group Directory instead
|
* Note: Please use Group Directory instead
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Friendica\App;
|
|
||||||
use Friendica\Content\Nav;
|
use Friendica\Content\Nav;
|
||||||
use Friendica\Content\Pager;
|
use Friendica\Content\Pager;
|
||||||
use Friendica\Content\Widget;
|
use Friendica\Content\Widget;
|
||||||
|
@ -16,8 +15,8 @@ use Friendica\Core\Hook;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
use Friendica\DI;
|
use Friendica\DI;
|
||||||
use Friendica\Model\Profile;
|
|
||||||
use Friendica\Model\User;
|
use Friendica\Model\User;
|
||||||
|
use Friendica\Security\OpenWebAuth;
|
||||||
|
|
||||||
global $forumdirectory_search;
|
global $forumdirectory_search;
|
||||||
|
|
||||||
|
@ -82,7 +81,7 @@ function forumdirectory_content()
|
||||||
$gdirpath = '';
|
$gdirpath = '';
|
||||||
$dirurl = DI::config()->get('system', 'directory');
|
$dirurl = DI::config()->get('system', 'directory');
|
||||||
if (strlen($dirurl)) {
|
if (strlen($dirurl)) {
|
||||||
$gdirpath = Profile::zrl($dirurl, true);
|
$gdirpath = OpenWebAuth::getZrlUrl($dirurl, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
$sql_extra = '';
|
$sql_extra = '';
|
||||||
|
|
|
@ -13,8 +13,8 @@ use Friendica\Core\Hook;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
use Friendica\DI;
|
use Friendica\DI;
|
||||||
use Friendica\Model\Profile;
|
|
||||||
use Friendica\Model\User;
|
use Friendica\Model\User;
|
||||||
|
use Friendica\Security\OpenWebAuth;
|
||||||
|
|
||||||
global $groupdirectory_search;
|
global $groupdirectory_search;
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@ function groupdirectory_content()
|
||||||
$gdirpath = '';
|
$gdirpath = '';
|
||||||
$dirurl = DI::config()->get('system', 'directory');
|
$dirurl = DI::config()->get('system', 'directory');
|
||||||
if (strlen($dirurl)) {
|
if (strlen($dirurl)) {
|
||||||
$gdirpath = Profile::zrl($dirurl, true);
|
$gdirpath = OpenWebAuth::getZrlUrl($dirurl, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
$sql_extra = '';
|
$sql_extra = '';
|
||||||
|
|
Loading…
Reference in a new issue