Merge pull request #748 from nupplaphil/remove_global_functions

Remove z_root()
This commit is contained in:
Hypolite Petovan 2018-10-13 19:32:25 -04:00 committed by GitHub
commit 0361bc0461
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -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/>';
}

View File

@ -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);
}