The last of the big workers moved ... delivery and notifier

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 04cf11550bad81f356f22a5ef4273a4f814a00f7..616c4adb86b7c35b0363f0592f80e4661a2a9f6a 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -1,13 +1,13 @@
 <?php
 
 use Friendica\App;
+use Friendica\Content\Smilies;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 
 require_once "include/friendica_smarty.php";
-require_once "include/Smilies.php";
 require_once "include/map.php";
 require_once "mod/proxy.php";
 
@@ -30,7 +30,7 @@ function replace_macros($s, $r) {
 
        $t = $a->template_engine();
        try {
-               $output = $t->replace_macros($s, $r);
+               $output = $t->replaceMacros($s, $r);
        } catch (Exception $e) {
                echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
                killme();
@@ -591,7 +591,7 @@ function get_markup_template($s, $root = '') {
        $a = get_app();
        $t = $a->template_engine();
        try {
-               $template = $t->get_template_file($s, $root);
+               $template = $t->getTemplateFile($s, $root);
        } catch (Exception $e) {
                echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
                killme();