Merge pull request #5862 from nupplaphil/rename_App_Methods

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 97baee7f60b551a76089ba31efbd66e573bb3412..5a18529d93ab68837560d1cb927fcbc131ff2bb7 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -42,7 +42,7 @@ function replace_macros($s, $r) {
        // pass $baseurl to all templates
        $r['$baseurl'] = System::baseUrl();
 
-       $t = $a->template_engine();
+       $t = $a->getTemplateEngine();
        try {
                $output = $t->replaceMacros($s, $r);
        } catch (Exception $e) {
@@ -50,7 +50,7 @@ function replace_macros($s, $r) {
                killme();
        }
 
-       $a->save_timestamp($stamp1, "rendering");
+       $a->saveTimestamp($stamp1, "rendering");
 
        return $output;
 }
@@ -473,7 +473,7 @@ function get_markup_template($s, $root = '') {
        $stamp1 = microtime(true);
 
        $a = get_app();
-       $t = $a->template_engine();
+       $t = $a->getTemplateEngine();
        try {
                $template = $t->getTemplateFile($s, $root);
        } catch (Exception $e) {
@@ -481,7 +481,7 @@ function get_markup_template($s, $root = '') {
                killme();
        }
 
-       $a->save_timestamp($stamp1, "file");
+       $a->saveTimestamp($stamp1, "file");
 
        return $template;
 }
@@ -574,7 +574,7 @@ function logger($msg, $level = LOGGER_INFO) {
 
        $stamp1 = microtime(true);
        @file_put_contents($logfile, $logline, FILE_APPEND);
-       $a->save_timestamp($stamp1, "file");
+       $a->saveTimestamp($stamp1, "file");
 }
 
 /**
@@ -634,7 +634,7 @@ function dlogger($msg, $level = LOGGER_INFO) {
 
        $stamp1 = microtime(true);
        @file_put_contents($logfile, $logline, FILE_APPEND);
-       $a->save_timestamp($stamp1, "file");
+       $a->saveTimestamp($stamp1, "file");
 }
 
 
@@ -1191,9 +1191,6 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
                                $a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), [
                                        '$baseurl' => System::baseUrl(),
                                ]);
-                               $a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), [
-                                       '$baseurl' => System::baseUrl(),
-                               ]);
                        }
 
                        $url_parts = explode('/', $the_url);
@@ -1417,7 +1414,7 @@ function get_plink($item) {
                        ];
 
                if (x($item, 'plink')) {
-                       $ret["href"] = $a->remove_baseurl($item['plink']);
+                       $ret["href"] = $a->removeBaseURL($item['plink']);
                        $ret["title"] = L10n::t('link to source');
                }