Merge pull request #748 from nupplaphil/remove_global_functions
Remove z_root()
This commit is contained in:
commit
0361bc0461
|
@ -28,7 +28,7 @@ function notifyall_module() {}
|
||||||
|
|
||||||
function notifyall_addon_admin(App $a, &$o)
|
function notifyall_addon_admin(App $a, &$o)
|
||||||
{
|
{
|
||||||
$o = '<div></div> <a href="' . z_root() . '/notifyall">' . L10n::t('Send email to all members') . '</a></br/>';
|
$o = '<div></div> <a href="' . $a->getBaseURL() . '/notifyall">' . L10n::t('Send email to all members') . '</a></br/>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -155,7 +155,7 @@ function openstreetmap_generate_map(&$a, &$b)
|
||||||
{
|
{
|
||||||
$tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
|
$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);
|
$tmsserver = str_replace('http:','https:',$tmsserver);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user