clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #931 from annando/fix-927 

Fix PR 927: Adds forgotten calls
This commit is contained in:
Hypolite Petovan 2019-12-29 21:05:33 -05:00 committed by GitHub
parent bbc629544f 141007764b
commit c03588f0b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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\Config;
use Friendica\Core\Hook;
@ -55,7 +56,7 @@ function openstreetmap_load_config(\Friendica\App $a, ConfigFileLoader $loader)
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;
}
@ -159,7 +160,7 @@ function openstreetmap_generate_map(&$a, &$b)
{
$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);
}