friendica
/
friendica-addons
7
2
Fork 13
Code Issues 3 Pull Requests 2 Releases 16 Wiki Activity

Fix PR 927: Adds forgotten calls

This commit is contained in:
Michael 2019-12-30 01:20:55 +00:00
parent bbc629544f
commit 141007764b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstreetmap/openstreetmap.php
View File

@ -9,6 +9,7 @@
* *
*/ */
use Friendica\DI;
use Friendica\Core\Cache; use Friendica\Core\Cache;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Hook; use Friendica\Core\Hook;
@ -55,7 +56,7 @@ function openstreetmap_load_config(\Friendica\App $a, ConfigFileLoader $loader)
function openstreetmap_alterheader($a, &$navHtml) function openstreetmap_alterheader($a, &$navHtml)
{ {
$addScriptTag = '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/openstreetmap/openstreetmap.js"></script>' . "\r\n"; $addScriptTag = '<script type="text/javascript" src="' . DI::baseUrl()->get() . '/addon/openstreetmap/openstreetmap.js"></script>' . "\r\n";
$a->page['htmlhead'] .= $addScriptTag; $a->page['htmlhead'] .= $addScriptTag;
} }
@ -159,7 +160,7 @@ function openstreetmap_generate_map(&$a, &$b)
{ {
$tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS); $tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
if (strpos($a->getBaseURL(true), 'https:') !== false) { if (strpos(DI::baseUrl()->get(true), 'https:') !== false) {
$tmsserver = str_replace('http:','https:',$tmsserver); $tmsserver = str_replace('http:','https:',$tmsserver);
} }