A few missed

a few missed function calls.

diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 66780e1fbec882290797a6833309f520312bd526..77dd1812a1089f69689425b6e9a0dabc25281f94 100644 (file)
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -55,7 +55,7 @@ function catavatar_addon_settings(App $a, &$s)
        }
 
        $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/catavatar/');
-       $s .= replace_macros ($t, [
+       $s .= Renderer::replaceMacros($t, [
                '$postpost' => !empty($_POST['catavatar-morecat']) || !empty($_POST['catavatar-emailcat']),
                '$uncache' => time(),
                '$uid' => local_user(),

diff --git a/curweather/curweather.php b/curweather/curweather.php
index 3382e731a6341188ddf8c2ed2a58a9ecb56d3365..85fd4a6033ebbfcb440e87fba7ec3ccb854b0de0 100644 (file)
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -137,7 +137,7 @@ function curweather_network_mod_init(App $a, &$b)
 
        if ($ok) {
                $t = Renderer::getMarkupTemplate("widget.tpl", "addon/curweather/" );
-               $curweather = replace_macros ($t, [
+               $curweather = Renderer::replaceMacros($t, [
                        '$title' => L10n::t("Current Weather"),
                        '$icon' => ProxyUtils::proxifyUrl('http://openweathermap.org/img/w/'.$res['icon'].'.png'),
                        '$city' => $res['city'],
@@ -200,7 +200,7 @@ function curweather_addon_settings(App $a, &$s)
        // load template and replace the macros
        $t = Renderer::getMarkupTemplate("settings.tpl", "addon/curweather/" );
 
-       $s = replace_macros ($t, [
+       $s = Renderer::replaceMacros($t, [
                '$submit' => L10n::t('Save Settings'),
                '$header' => L10n::t('Current Weather').' '.L10n::t('Settings'),
                '$noappidtext' => $noappidtext,
@@ -240,7 +240,7 @@ function curweather_addon_admin(App $a, &$o)
 
        $t = Renderer::getMarkupTemplate("admin.tpl", "addon/curweather/" );
 
-       $o = replace_macros ($t, [
+       $o = Renderer::replaceMacros($t, [
                '$submit' => L10n::t('Save Settings'),
                '$cachetime' => [
                        'cachetime',