remove z_root()

diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index a019303920ae987e3911af835bf5bdd8d7d198c6..824e306b92cd90b56776b4406a6fd69be00d49dc 100644 (file)
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -28,7 +28,7 @@ function notifyall_module() {}
 
 function notifyall_addon_admin(App $a, &$o)
 {
-       $o = '<div></div>&nbsp;&nbsp;&nbsp;&nbsp;<a href="' . z_root() . '/notifyall">' . L10n::t('Send email to all members') . '</a></br/>';
+       $o = '<div></div>&nbsp;&nbsp;&nbsp;&nbsp;<a href="' . $a->getBaseURL() . '/notifyall">' . L10n::t('Send email to all members') . '</a></br/>';
 }
 
 

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 0420591eb95b414fc8288afd344c9f07fb2f8e21..8255b940e669c350abd7fb1fc9512a40b56b8155 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -155,7 +155,7 @@ function openstreetmap_generate_map(&$a, &$b)
 {
        $tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
 
-       if (strpos(z_root(), 'https:') !== false) {
+       if (strpos($a->getBaseURL(true), 'https:') !== false) {
                $tmsserver = str_replace('http:','https:',$tmsserver);
        }