get markup template

implement getMarkupTemplate function

doc/Addons.md

@@ -160,7 +160,7 @@ In your code, like in the function addon_name_content(), load the template file
 ```php
 # load template file. first argument is the template name,
 # second is the addon path relative to friendica top folder
-$tpl = get_markup_template('mytemplate.tpl', 'addon/addon_name/');
+$tpl = Renderer::getMarkupTemplate('mytemplate.tpl', 'addon/addon_name/');
 
 # apply template. first argument is the loaded template,
 # second an array of 'name' => 'values' to pass to template

doc/smarty3-templates.md

@@ -22,7 +22,7 @@ directory.
 
 To render a template use the function *getMarkupTemplate* to load the template and *replaceMacros* to replace the macros/variables in the just loaded template file.
 
-		$tpl = get_markup_template('install_settings.tpl');
+		$tpl = Renderer::getMarkupTemplate('install_settings.tpl');
         $o .= Renderer::replaceMacros($tpl, array( ... ));
 
 the array consists of an association of an identifier and the value for that identifier, i.e.

include/conversation.php

@@ -554,7 +554,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
 	$threads = [];
 	$threadsid = -1;
 
-	$page_template = get_markup_template("conversation.tpl");
+	$page_template = Renderer::getMarkupTemplate("conversation.tpl");
 
 	if (!empty($items)) {
 		if (in_array($mode, ['community', 'contacts'])) {
@@ -713,7 +713,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
 			}
 		} else {
 			// Normal View
-			$page_template = get_markup_template("threaded_conversation.tpl");
+			$page_template = Renderer::getMarkupTemplate("threaded_conversation.tpl");
 
 			$conv = new Thread($mode, $preview, $writable);
 
@@ -1063,7 +1063,7 @@ function format_like($cnt, array $arr, $type, $id) {
 	}
 
 	$phrase .= EOL ;
-	$o .= Renderer::replaceMacros(get_markup_template('voting_fakelink.tpl'), [
+	$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [
 		'$phrase' => $phrase,
 		'$type' => $type,
 		'$id' => $id
@@ -1077,9 +1077,9 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
 {
 	$o = '';
 
-	$geotag = x($x, 'allow_location') ? Renderer::replaceMacros(get_markup_template('jot_geotag.tpl'), []) : '';
+	$geotag = x($x, 'allow_location') ? Renderer::replaceMacros(Renderer::getMarkupTemplate('jot_geotag.tpl'), []) : '';
 
-	$tpl = get_markup_template('jot-header.tpl');
+	$tpl = Renderer::getMarkupTemplate('jot-header.tpl');
 	$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
 		'$newpost'   => 'true',
 		'$baseurl'   => System::baseUrl(true),
@@ -1119,7 +1119,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
 	}
 
 	// $tpl = Renderer::replaceMacros($tpl,array('$jotplugins' => $jotplugins));
-	$tpl = get_markup_template("jot.tpl");
+	$tpl = Renderer::getMarkupTemplate("jot.tpl");
 
 	$o .= Renderer::replaceMacros($tpl,[
 		'$new_post' => L10n::t('New Post'),

include/enotify.php

@@ -590,7 +590,7 @@ function notification($params)
 		$content_allowed = ((!Config::get('system', 'enotify_no_content')) || ($params['type'] == SYSTEM_EMAIL));
 
 		// load the template for private message notifications
-		$tpl = get_markup_template('email_notify_html.tpl');
+		$tpl = Renderer::getMarkupTemplate('email_notify_html.tpl');
 		$email_html_body = Renderer::replaceMacros($tpl, [
 			'$banner'       => $datarray['banner'],
 			'$product'      => $datarray['product'],
@@ -611,7 +611,7 @@ function notification($params)
 		]);
 
 		// load the template for private message notifications
-		$tpl = get_markup_template('email_notify_text.tpl');
+		$tpl = Renderer::getMarkupTemplate('email_notify_text.tpl');
 		$email_text_body = Renderer::replaceMacros($tpl, [
 			'$banner'       => $datarray['banner'],
 			'$product'      => $datarray['product'],

include/items.php

@@ -391,7 +391,7 @@ function drop_item($id)
 				}
 			}
 
-			return Renderer::replaceMacros(get_markup_template('confirm.tpl'), [
+			return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
 				'$method' => 'get',
 				'$message' => L10n::t('Do you really want to delete this item?'),
 				'$extra_inputs' => $inputs,
@@ -482,7 +482,7 @@ function posted_date_widget($url, $uid, $wall)
 	$cutoff_year = intval(DateTimeFormat::localNow('Y')) - $visible_years;
 	$cutoff = ((array_key_exists($cutoff_year, $ret))? true : false);
 
-	$o = Renderer::replaceMacros(get_markup_template('posted_date_widget.tpl'),[
+	$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('posted_date_widget.tpl'),[
 		'$title' => L10n::t('Archives'),
 		'$size' => $visible_years,
 		'$cutoff_year' => $cutoff_year,

include/text.php

@@ -266,7 +266,7 @@ function unxmlify($s) {
  * @return string html for loader
  */
 function scroll_loader() {
-	$tpl = get_markup_template("scroll_loader.tpl");
+	$tpl = Renderer::getMarkupTemplate("scroll_loader.tpl");
 	return Renderer::replaceMacros($tpl, [
 		'wait' => L10n::t('Loading more entries...'),
 		'end' => L10n::t('The end')
@@ -513,7 +513,7 @@ function contact_block() {
 		}
 	}
 
-	$tpl = get_markup_template('contact_block.tpl');
+	$tpl = Renderer::getMarkupTemplate('contact_block.tpl');
 	$o = Renderer::replaceMacros($tpl, [
 		'$contacts' => $contacts,
 		'$nickname' => $a->profile['nickname'],
@@ -571,7 +571,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
 		$url = '';
 	}
 
-	return Renderer::replaceMacros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),[
+	return Renderer::replaceMacros(Renderer::getMarkupTemplate(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),[
 		'$click' => defaults($contact, 'click', ''),
 		'$class' => $class,
 		'$url' => $url,
@@ -626,7 +626,7 @@ function search($s, $id = 'search-box', $url = 'search', $save = false, $aside =
 		}
 	}
 
-	return Renderer::replaceMacros(get_markup_template('searchbox.tpl'), $values);
+	return Renderer::replaceMacros(Renderer::getMarkupTemplate('searchbox.tpl'), $values);
 }
 
 /**
@@ -904,14 +904,14 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
 		if (strpos($mime, 'video') !== false) {
 			if (!$vhead) {
 				$vhead = true;
-				$a->page['htmlhead'] .= Renderer::replaceMacros(get_markup_template('videos_head.tpl'), [
+				$a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('videos_head.tpl'), [
 					'$baseurl' => System::baseUrl(),
 				]);
 			}
 
 			$url_parts = explode('/', $the_url);
 			$id = end($url_parts);
-			$as .= Renderer::replaceMacros(get_markup_template('video_top.tpl'), [
+			$as .= Renderer::replaceMacros(Renderer::getMarkupTemplate('video_top.tpl'), [
 				'$video' => [
 					'id'     => $id,
 					'title'  => L10n::t('View Video'),
@@ -1006,7 +1006,7 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
 function apply_content_filter($html, array $reasons)
 {
 	if (count($reasons)) {
-		$tpl = get_markup_template('wall/content_filter.tpl');
+		$tpl = Renderer::getMarkupTemplate('wall/content_filter.tpl');
 		$html = Renderer::replaceMacros($tpl, [
 			'$reasons'   => $reasons,
 			'$rnd'       => random_string(8),

mod/admin.php

@@ -175,7 +175,7 @@ function admin_content(App $a)
 	//	apc_delete($toDelete);
 	//}
 	// Header stuff
-	$a->page['htmlhead'] .= Renderer::replaceMacros(get_markup_template('admin/settings_head.tpl'), []);
+	$a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/settings_head.tpl'), []);
 
 	/*
 	 * Side bar links
@@ -226,7 +226,7 @@ function admin_content(App $a)
 		$addons_admin[] = $addon;
 	}
 
-	$t = get_markup_template('admin/aside.tpl');
+	$t = Renderer::getMarkupTemplate('admin/aside.tpl');
 	$a->page['aside'] .= Renderer::replaceMacros($t, [
 		'$admin' => $aside_tools,
 		'$subpages' => $aside_sub,
@@ -314,7 +314,7 @@ function admin_content(App $a)
 function admin_page_tos(App $a)
 {
 	$tos = new Tos();
-	$t = get_markup_template('admin/tos.tpl');
+	$t = Renderer::getMarkupTemplate('admin/tos.tpl');
 	return Renderer::replaceMacros($t, [
 		'$title' => L10n::t('Administration'),
 		'$page' => L10n::t('Terms of Service'),
@@ -376,7 +376,7 @@ function admin_page_blocklist(App $a)
 			];
 		}
 	}
-	$t = get_markup_template('admin/blocklist.tpl');
+	$t = Renderer::getMarkupTemplate('admin/blocklist.tpl');
 	return Renderer::replaceMacros($t, [
 		'$title' => L10n::t('Administration'),
 		'$page' => L10n::t('Server Blocklist'),
@@ -491,7 +491,7 @@ function admin_page_contactblock(App $a)
 
 	$contacts = DBA::toArray($statement);
 
-	$t = get_markup_template('admin/contactblock.tpl');
+	$t = Renderer::getMarkupTemplate('admin/contactblock.tpl');
 	$o = Renderer::replaceMacros($t, [
 		// strings //
 		'$title'       => L10n::t('Administration'),
@@ -533,7 +533,7 @@ function admin_page_contactblock(App $a)
  */
 function admin_page_deleteitem(App $a)
 {
-	$t = get_markup_template('admin/deleteitem.tpl');
+	$t = Renderer::getMarkupTemplate('admin/deleteitem.tpl');
 
 	return Renderer::replaceMacros($t, [
 		'$title' => L10n::t('Administration'),
@@ -726,7 +726,7 @@ function admin_page_federation(App $a)
 	$hint = L10n::t('The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here.');
 
 	// load the template, replace the macros and return the page content
-	$t = get_markup_template('admin/federation.tpl');
+	$t = Renderer::getMarkupTemplate('admin/federation.tpl');
 	return Renderer::replaceMacros($t, [
 		'$title' => L10n::t('Administration'),
 		'$page' => L10n::t('Federation Statistics'),
@@ -769,7 +769,7 @@ function admin_page_queue(App $a)
 	}
 	DBA::close($entries);
 
-	$t = get_markup_template('admin/queue.tpl');
+	$t = Renderer::getMarkupTemplate('admin/queue.tpl');
 	return Renderer::replaceMacros($t, [
 		'$title' => L10n::t('Administration'),
 		'$page' => L10n::t('Inspect Queue'),
@@ -820,7 +820,7 @@ function admin_page_workerqueue(App $a, $deferred)
 	}
 	DBA::close($entries);
 
-	$t = get_markup_template('admin/workerqueue.tpl');
+	$t = Renderer::getMarkupTemplate('admin/workerqueue.tpl');
 	return Renderer::replaceMacros($t, [
 		'$title' => L10n::t('Administration'),
 		'$page' => $sub_title,
@@ -938,7 +938,7 @@ function admin_page_summary(App $a)
 						  'memory_limit' => ini_get('memory_limit')],
 				'mysql' => ['max_allowed_packet' => $max_allowed_packet]];
 
-	$t = get_markup_template('admin/summary.tpl');
+	$t = Renderer::getMarkupTemplate('admin/summary.tpl');
 	return Renderer::replaceMacros($t, [
 		'$title' => L10n::t('Administration'),
 		'$page' => L10n::t('Summary'),
@@ -1449,7 +1449,7 @@ function admin_page_site(App $a)
 		$optimize_max_tablesize = -1;
 	}
 
-	$t = get_markup_template('admin/site.tpl');
+	$t = Renderer::getMarkupTemplate('admin/site.tpl');
 	return Renderer::replaceMacros($t, [
 		'$title' => L10n::t('Administration'),
 		'$page' => L10n::t('Site'),
@@ -1643,13 +1643,13 @@ function admin_page_dbsync(App $a)
 	}
 
 	if (!count($failed)) {
-		$o = Renderer::replaceMacros(get_markup_template('structure_check.tpl'), [
+		$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('structure_check.tpl'), [
 			'$base' => System::baseUrl(true),
 			'$banner' => L10n::t('No failed updates.'),
 			'$check' => L10n::t('Check database structure'),
 		]);
 	} else {
-		$o = Renderer::replaceMacros(get_markup_template('failed_updates.tpl'), [
+		$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('failed_updates.tpl'), [
 			'$base' => System::baseUrl(true),
 			'$banner' => L10n::t('Failed Updates'),
 			'$desc' => L10n::t('This does not include updates prior to 1139, which did not return a status.'),
@@ -1910,7 +1910,7 @@ function admin_page_users(App $a)
 
 	$th_users = array_map(null, [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Type')], $valid_orders);
 
-	$t = get_markup_template('admin/users.tpl');
+	$t = Renderer::getMarkupTemplate('admin/users.tpl');
 	$o = Renderer::replaceMacros($t, [
 		// strings //
 		'$title' => L10n::t('Administration'),
@@ -2026,7 +2026,7 @@ function admin_page_addons(App $a, array $addons_admin)
 			$func($a, $admin_form);
 		}
 
-		$t = get_markup_template('admin/addon_details.tpl');
+		$t = Renderer::getMarkupTemplate('admin/addon_details.tpl');
 
 		return Renderer::replaceMacros($t, [
 			'$title' => L10n::t('Administration'),
@@ -2087,7 +2087,7 @@ function admin_page_addons(App $a, array $addons_admin)
 		}
 	}
 
-	$t = get_markup_template('admin/addons.tpl');
+	$t = Renderer::getMarkupTemplate('admin/addons.tpl');
 	return Renderer::replaceMacros($t, [
 		'$title' => L10n::t('Administration'),
 		'$page' => L10n::t('Addons'),
@@ -2297,7 +2297,7 @@ function admin_page_themes(App $a)
 			$screenshot = null;
 		}
 
-		$t = get_markup_template('admin/addon_details.tpl');
+		$t = Renderer::getMarkupTemplate('admin/addon_details.tpl');
 		return Renderer::replaceMacros($t, [
 			'$title' => L10n::t('Administration'),
 			'$page' => L10n::t('Themes'),
@@ -2341,7 +2341,7 @@ function admin_page_themes(App $a)
 		$addons[] = [$th['name'], (($th['allowed']) ? "on" : "off"), Theme::getInfo($th['name'])];
 	}
 
-	$t = get_markup_template('admin/addons.tpl');
+	$t = Renderer::getMarkupTemplate('admin/addons.tpl');
 	return Renderer::replaceMacros($t, [
 		'$title'               => L10n::t('Administration'),
 		'$page'                => L10n::t('Themes'),
@@ -2415,7 +2415,7 @@ function admin_page_logs(App $a)
 		$phplogenabled = L10n::t('PHP log currently disabled.');
 	}
 
-	$t = get_markup_template('admin/logs.tpl');
+	$t = Renderer::getMarkupTemplate('admin/logs.tpl');
 
 	return Renderer::replaceMacros($t, [
 		'$title' => L10n::t('Administration'),
@@ -2456,7 +2456,7 @@ function admin_page_logs(App $a)
  */
 function admin_page_viewlogs(App $a)
 {
-	$t = get_markup_template('admin/viewlogs.tpl');
+	$t = Renderer::getMarkupTemplate('admin/viewlogs.tpl');
 	$f = Config::get('system', 'logfile');
 	$data = '';
 
@@ -2562,7 +2562,7 @@ function admin_page_features(App $a)
 			}
 		}
 
-		$tpl = get_markup_template('admin/settings_features.tpl');
+		$tpl = Renderer::getMarkupTemplate('admin/settings_features.tpl');
 		$o = Renderer::replaceMacros($tpl, [
 			'$form_security_token' => BaseModule::getFormSecurityToken("admin_manage_features"),
 			'$title' => L10n::t('Manage Additional Features'),

mod/allfriends.php

@@ -99,7 +99,7 @@ function allfriends_content(App $a)
 
 	$tab_str = Module\Contact::getTabsHTML($a, $contact, 4);
 
-	$tpl = get_markup_template('viewcontact_template.tpl');
+	$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
 	$o .= Renderer::replaceMacros($tpl, [
 		//'$title' => L10n::t('Friends of %s', htmlentities($c[0]['name'])),

mod/api.php

@@ -82,7 +82,7 @@ function api_content(App $a)
 				killme();
 			}
 
-			$tpl = get_markup_template("oauth_authorize_done.tpl");
+			$tpl = Renderer::getMarkupTemplate("oauth_authorize_done.tpl");
 			$o = Renderer::replaceMacros($tpl, [
 				'$title' => L10n::t('Authorize application connection'),
 				'$info' => L10n::t('Return to your app and insert this Securty Code:'),
@@ -104,7 +104,7 @@ function api_content(App $a)
 			return "Invalid request. Unknown token.";
 		}
 
-		$tpl = get_markup_template('oauth_authorize.tpl');
+		$tpl = Renderer::getMarkupTemplate('oauth_authorize.tpl');
 		$o = Renderer::replaceMacros($tpl, [
 			'$title' => L10n::t('Authorize application connection'),
 			'$app' => $app,

mod/apps.php

@@ -25,7 +25,7 @@ function apps_content()
 		notice(L10n::t('No installed applications.') . EOL);
 	}
 
-	$tpl = get_markup_template('apps.tpl');
+	$tpl = Renderer::getMarkupTemplate('apps.tpl');
 	return Renderer::replaceMacros($tpl, [
 		'$title' => $title,
 		'$apps'  => $apps,

mod/babel.php

@@ -140,7 +140,7 @@ function babel_content()
 		}
 	}
 
-	$tpl = get_markup_template('babel.tpl');
+	$tpl = Renderer::getMarkupTemplate('babel.tpl');
 	$o = Renderer::replaceMacros($tpl, [
 		'$text'          => ['text', L10n::t('Source text'), htmlentities(defaults($_REQUEST, 'text', '')), ''],
 		'$type_bbcode'   => ['type', L10n::t('BBCode'), 'bbcode', '', defaults($_REQUEST, 'type', 'bbcode') == 'bbcode'],

mod/cal.php

@@ -60,7 +60,7 @@ function cal_init(App $a)
 
 	$account_type = Contact::getAccountType($profile);
 
-	$tpl = get_markup_template("vcard-widget.tpl");
+	$tpl = Renderer::getMarkupTemplate("vcard-widget.tpl");
 
 	$vcard_widget = Renderer::replaceMacros($tpl, [
 		'$name' => $profile['name'],
@@ -89,7 +89,7 @@ function cal_content(App $a)
 	// get the translation strings for the callendar
 	$i18n = Event::getStrings();
 
-	$htpl = get_markup_template('event_head.tpl');
+	$htpl = Renderer::getMarkupTemplate('event_head.tpl');
 	$a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
 		'$baseurl' => System::baseUrl(),
 		'$module_url' => '/cal/' . $a->data['user']['nickname'],
@@ -249,12 +249,12 @@ function cal_content(App $a)
 
 		// links: array('href', 'text', 'extra css classes', 'title')
 		if (x($_GET, 'id')) {
-			$tpl = get_markup_template("event.tpl");
+			$tpl = Renderer::getMarkupTemplate("event.tpl");
 		} else {
 //			if (Config::get('experimentals','new_calendar')==1){
-			$tpl = get_markup_template("events_js.tpl");
+			$tpl = Renderer::getMarkupTemplate("events_js.tpl");
 //			} else {
-//				$tpl = get_markup_template("events.tpl");
+//				$tpl = Renderer::getMarkupTemplate("events.tpl");
 //			}
 		}
 

mod/common.php

@@ -49,7 +49,7 @@ function common_content(App $a)
 		$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
 
 		if (DBA::isResult($contact)) {
-			$vcard_widget = Renderer::replaceMacros(get_markup_template("vcard-widget.tpl"), [
+			$vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate("vcard-widget.tpl"), [
 				'$name'  => htmlentities($contact['name']),
 				'$photo' => $contact['photo'],
 				'url'    => 'contact/' . $cid
@@ -143,7 +143,7 @@ function common_content(App $a)
 		$title = L10n::t('Common Friends');
 	}
 
-	$tpl = get_markup_template('viewcontact_template.tpl');
+	$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
 	$o .= Renderer::replaceMacros($tpl, [
 		'$title'    => $title,

mod/community.php

@@ -120,7 +120,7 @@ function community_content(App $a, $update = 0)
 			];
 		}
 
-		$tab_tpl = get_markup_template('common_tabs.tpl');
+		$tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
 		$o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
 
 		Nav::setSelected('community');
@@ -199,7 +199,7 @@ function community_content(App $a, $update = 0)
 		$o .= $pager->renderMinimal(count($r));
 	}
 
-	$t = get_markup_template("community.tpl");
+	$t = Renderer::getMarkupTemplate("community.tpl");
 	return Renderer::replaceMacros($t, [
 		'$content' => $o,
 		'$header' => '',

mod/credits.php

@@ -14,7 +14,7 @@ function credits_content()
 	/* fill the page with credits */
 	$credits_string = file_get_contents('util/credits.txt');
 	$names = explode("\n", htmlspecialchars($credits_string));
-	$tpl = get_markup_template('credits.tpl');
+	$tpl = Renderer::getMarkupTemplate('credits.tpl');
 	return Renderer::replaceMacros($tpl, [
 		'$title'  => L10n::t('Credits'),
 		'$thanks' => L10n::t('Friendica is a community project, that would not be possible without the help of many people. Here is a list of those who have contributed to the code or the translation of Friendica. Thank you all!'),

mod/crepair.php

@@ -137,7 +137,7 @@ function crepair_content(App $a)
 
 	$tab_str = Module\Contact::getTabsHTML($a, $contact, 5);
 
-	$tpl = get_markup_template('crepair.tpl');
+	$tpl = Renderer::getMarkupTemplate('crepair.tpl');
 	$o = Renderer::replaceMacros($tpl, [
 		'$tab_str'        => $tab_str,
 		'$warning'        => $warning,

mod/delegate.php

@@ -164,7 +164,7 @@ function delegate_content(App $a)
 		$parent_password = ['parent_password', L10n::t('Parent Password:'), '', L10n::t('Please enter the password of the parent account to legitimize your request.')];
 	}
 
-	$o = Renderer::replaceMacros(get_markup_template('delegate.tpl'), [
+	$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('delegate.tpl'), [
 		'$form_security_token' => BaseModule::getFormSecurityToken('delegate'),
 		'$parent_header' => L10n::t('Parent User'),
 		'$parent_user' => $parent_user,

mod/dfrn_request.php

@@ -515,7 +515,7 @@ function dfrn_request_content(App $a)
 			return; // NOTREACHED
 		}
 
-		$tpl = get_markup_template("dfrn_req_confirm.tpl");
+		$tpl = Renderer::getMarkupTemplate("dfrn_req_confirm.tpl");
 		$o = Renderer::replaceMacros($tpl, [
 			'$dfrn_url' => $dfrn_url,
 			'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
@@ -628,9 +628,9 @@ function dfrn_request_content(App $a)
 		 * it doesn't matter if they know you or not.
 		 */
 		if ($a->profile['page-flags'] == Contact::PAGE_NORMAL) {
-			$tpl = get_markup_template('dfrn_request.tpl');
+			$tpl = Renderer::getMarkupTemplate('dfrn_request.tpl');
 		} else {
-			$tpl = get_markup_template('auto_request.tpl');
+			$tpl = Renderer::getMarkupTemplate('auto_request.tpl');
 		}
 
 		$page_desc = L10n::t("Please enter your 'Identity Address' from one of the following supported communications networks:");

mod/directory.php

@@ -202,7 +202,7 @@ function directory_content(App $a)
 		}
 		DBA::close($r);
 
-		$tpl = get_markup_template('directory_header.tpl');
+		$tpl = Renderer::getMarkupTemplate('directory_header.tpl');
 
 		$o .= Renderer::replaceMacros($tpl, [
 			'$search'    => $search,

mod/dirfind.php

@@ -250,7 +250,7 @@ function dirfind_content(App $a, $prefix = "") {
 				$entries[] = $entry;
 			}
 
-			$tpl = get_markup_template('viewcontact_template.tpl');
+			$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 			$o .= Renderer::replaceMacros($tpl,[
 				'title' => $header,
 				'$contacts' => $entries,

mod/display.php

@@ -264,7 +264,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 		$conversation = '';
 	}
 
-	$a->page['htmlhead'] .= Renderer::replaceMacros(get_markup_template('display-head.tpl'),
+	$a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('display-head.tpl'),
 				['$alternate' => $alternate,
 					'$conversation' => $conversation]);
 

mod/editpost.php

@@ -41,11 +41,11 @@ function editpost_content(App $a)
 
 	$geotag = '';
 
-	$o .= Renderer::replaceMacros(get_markup_template("section_title.tpl"), [
+	$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate("section_title.tpl"), [
 		'$title' => L10n::t('Edit post')
 	]);
 
-	$tpl = get_markup_template('jot-header.tpl');
+	$tpl = Renderer::getMarkupTemplate('jot-header.tpl');
 	$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
 		'$baseurl' => System::baseUrl(),
 		'$ispublic' => '&nbsp;', // L10n::t('Visible to <strong>everybody</strong>'),
@@ -53,7 +53,7 @@ function editpost_content(App $a)
 		'$nickname' => $a->user['nickname']
 	]);
 
-	$tpl = get_markup_template("jot.tpl");
+	$tpl = Renderer::getMarkupTemplate("jot.tpl");
 
 	if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
 		$lockstate = 'lock';

mod/events.php

@@ -226,7 +226,7 @@ function events_content(App $a)
 	// get the translation strings for the callendar
 	$i18n = Event::getStrings();
 
-	$htpl = get_markup_template('event_head.tpl');
+	$htpl = Renderer::getMarkupTemplate('event_head.tpl');
 	$a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
 		'$baseurl' => System::baseUrl(),
 		'$module_url' => '/events',
@@ -368,9 +368,9 @@ function events_content(App $a)
 		}
 
 		if (!empty($_GET['id'])) {
-			$tpl = get_markup_template("event.tpl");
+			$tpl = Renderer::getMarkupTemplate("event.tpl");
 		} else {
-			$tpl = get_markup_template("events_js.tpl");
+			$tpl = Renderer::getMarkupTemplate("events_js.tpl");
 		}
 
 		// Get rid of dashes in key names, Smarty3 can't handle them
@@ -498,7 +498,7 @@ function events_content(App $a)
 			$uri = '';
 		}
 
-		$tpl = get_markup_template('event_form.tpl');
+		$tpl = Renderer::getMarkupTemplate('event_form.tpl');
 
 		$o .= Renderer::replaceMacros($tpl, [
 			'$post' => System::baseUrl() . '/events',

mod/fbrowser.php

@@ -94,7 +94,7 @@ function fbrowser_content(App $a)
 			}
 			$files = array_map("_map_files1", $r);
 
-			$tpl = get_markup_template($template_file);
+			$tpl = Renderer::getMarkupTemplate($template_file);
 
 			$o =  Renderer::replaceMacros($tpl, [
 				'$type'     => 'image',
@@ -126,7 +126,7 @@ function fbrowser_content(App $a)
 				$files = array_map("_map_files2", $files);
 
 
-				$tpl = get_markup_template($template_file);
+				$tpl = Renderer::getMarkupTemplate($template_file);
 				$o = Renderer::replaceMacros($tpl, [
 					'$type'     => 'file',
 					'$baseurl'  => System::baseUrl(),

mod/feedtest.php

@@ -44,7 +44,7 @@ function feedtest_content(App $a)
 		];
 	}
 
-	$tpl = get_markup_template('feedtest.tpl');
+	$tpl = Renderer::getMarkupTemplate('feedtest.tpl');
 	$o = Renderer::replaceMacros($tpl, [
 		'$url'    => ['url', L10n::t('Source URL'), defaults($_REQUEST, 'url', ''), ''],
 		'$result' => $result

mod/filer.php

@@ -31,7 +31,7 @@ function filer_content(App $a)
 		$filetags = FileTag::fileToList($filetags, 'file');
 		$filetags = explode(",", $filetags);
 
-		$tpl = get_markup_template("filer_dialog.tpl");
+		$tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");
 		$o = Renderer::replaceMacros($tpl, [
 			'$field' => ['term', L10n::t("Save to Folder:"), '', '', $filetags, L10n::t('- select -')],
 			'$submit' => L10n::t('Save'),

mod/follow.php

@@ -109,10 +109,10 @@ function follow_content(App $a)
 
 	if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($r)) {
 		$request = $ret['request'];
-		$tpl = get_markup_template('dfrn_request.tpl');
+		$tpl = Renderer::getMarkupTemplate('dfrn_request.tpl');
 	} else {
 		$request = System::baseUrl() . '/follow';
-		$tpl = get_markup_template('auto_request.tpl');
+		$tpl = Renderer::getMarkupTemplate('auto_request.tpl');
 	}
 
 	$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid));
@@ -188,7 +188,7 @@ function follow_content(App $a)
 	}
 
 	if ($gcontact_id <> 0) {
-		$o .= Renderer::replaceMacros(get_markup_template('section_title.tpl'),
+		$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'),
 			['$title' => L10n::t('Status Messages and Posts')]
 		);
 

mod/group.php

@@ -98,7 +98,7 @@ function group_content(App $a) {
 		$switchtotext = Config::get('system', 'groupedit_image_limit', 400);
 	}
 
-	$tpl = get_markup_template('group_edit.tpl');
+	$tpl = Renderer::getMarkupTemplate('group_edit.tpl');
 
 	$context = [
 		'$submit' => L10n::t('Save Group'),
@@ -215,7 +215,7 @@ function group_content(App $a) {
 			}
 		}
 
-		$drop_tpl = get_markup_template('group_drop.tpl');
+		$drop_tpl = Renderer::getMarkupTemplate('group_drop.tpl');
 		$drop_txt = Renderer::replaceMacros($drop_tpl, [
 			'$id' => $group['id'],
 			'$delete' => L10n::t('Delete Group'),
@@ -307,7 +307,7 @@ function group_content(App $a) {
 	$context['$shortmode'] = (($switchtotext && ($total > $switchtotext)) ? true : false);
 
 	if ($change) {
-		$tpl = get_markup_template('groupeditor.tpl');
+		$tpl = Renderer::getMarkupTemplate('groupeditor.tpl');
 		echo Renderer::replaceMacros($tpl, $context);
 		killme();
 	}

mod/help.php

@@ -61,7 +61,7 @@ function help_content(App $a)
 
 	if (!strlen($text)) {
 		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . L10n::t('Not Found'));
-		$tpl = get_markup_template("404.tpl");
+		$tpl = Renderer::getMarkupTemplate("404.tpl");
 		return Renderer::replaceMacros($tpl, [
 			'$message' => L10n::t('Page not found.')
 		]);

mod/home.php

@@ -54,7 +54,7 @@ function home_content(App $a) {
 	Addon::callHooks("home_content",$content);
 
 
-	$tpl = get_markup_template('home.tpl');
+	$tpl = Renderer::getMarkupTemplate('home.tpl');
 	return Renderer::replaceMacros($tpl, [
 		'$defaultheader' => $defaultheader,
 		'$customhome' => $customhome,

mod/hostxrd.php

@@ -22,7 +22,7 @@ function hostxrd_init(App $a)
 		Config::set('system','site_pubkey', $res['pubkey']);
 	}
 
-	$tpl = get_markup_template('xrd_host.tpl');
+	$tpl = Renderer::getMarkupTemplate('xrd_host.tpl');
 	echo Renderer::replaceMacros($tpl, [
 		'$zhost' => $a->getHostName(),
 		'$zroot' => System::baseUrl(),

mod/hovercard.php

@@ -111,7 +111,7 @@ function hovercard_content()
 		'actions'  => $actions,
 	];
 	if ($datatype == 'html') {
-		$tpl = get_markup_template('hovercard.tpl');
+		$tpl = Renderer::getMarkupTemplate('hovercard.tpl');
 		$o = Renderer::replaceMacros($tpl, [
 			'$profile' => $profile,
 		]);
@@ -134,7 +134,7 @@ function get_template_content($template, $root = '')
 {
 	// We load the whole template system to get the filename.
 	// Maybe we can do it a little bit smarter if I get time.
-	$t = get_markup_template($template, $root);
+	$t = Renderer::getMarkupTemplate($template, $root);
 	$filename = $t->filename;
 
 	// Get the content of the template file

mod/invite.php

@@ -111,7 +111,7 @@ function invite_content(App $a) {
 		return;
 	}
 
-	$tpl = get_markup_template('invite.tpl');
+	$tpl = Renderer::getMarkupTemplate('invite.tpl');
 	$invonly = false;
 
 	if (Config::get('system', 'invitation_only')) {

mod/lostpass.php

@@ -116,7 +116,7 @@ function lostpass_content(App $a)
 
 function lostpass_form()
 {
-	$tpl = get_markup_template('lostpass.tpl');
+	$tpl = Renderer::getMarkupTemplate('lostpass.tpl');
 	$o = Renderer::replaceMacros($tpl, [
 		'$title' => L10n::t('Forgot your Password?'),
 		'$desc' => L10n::t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'),
@@ -135,7 +135,7 @@ function lostpass_generate_password($user)
 	$new_password = User::generateNewPassword();
 	$result = User::updatePassword($user['uid'], $new_password);
 	if (DBA::isResult($result)) {
-		$tpl = get_markup_template('pwdreset.tpl');
+		$tpl = Renderer::getMarkupTemplate('pwdreset.tpl');
 		$o .= Renderer::replaceMacros($tpl, [
 			'$lbl1'    => L10n::t('Password Reset'),
 			'$lbl2'    => L10n::t('Your password has been reset as requested.'),

mod/maintenance.php

@@ -21,7 +21,7 @@ function maintenance_content(App $a)
 	header('Status: 503 Service Temporarily Unavailable');
 	header('Retry-After: 600');
 
-	return Renderer::replaceMacros(get_markup_template('maintenance.tpl'), [
+	return Renderer::replaceMacros(Renderer::getMarkupTemplate('maintenance.tpl'), [
 		'$sysdown' => L10n::t('System down for maintenance'),
 		'$reason' => $reason
 	]);

mod/manage.php

@@ -177,7 +177,7 @@ function manage_content(App $a) {
 		$identities[$key]['notifications'] = $notifications;
 	}
 
-	$o = Renderer::replaceMacros(get_markup_template('manage.tpl'), [
+	$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('manage.tpl'), [
 		'$title' => L10n::t('Manage Identities and/or Pages'),
 		'$desc' => L10n::t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions'),
 		'$choose' => L10n::t('Select an identity to manage: '),

mod/manifest.php

@@ -7,7 +7,7 @@ use Friendica\Core\Renderer;
 
 function manifest_content(App $a) {
 
-	$tpl = get_markup_template('manifest.tpl');
+	$tpl = Renderer::getMarkupTemplate('manifest.tpl');
 
 	header('Content-type: application/manifest+json');
 

mod/match.php

@@ -113,7 +113,7 @@ function match_content(App $a)
 				}
 			}
 
-			$tpl = get_markup_template('viewcontact_template.tpl');
+			$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
 			$o .= Renderer::replaceMacros($tpl, [
 				'$title'    => L10n::t('Profile Match'),

mod/message.php

@@ -37,14 +37,14 @@ function message_init(App $a)
 		'accesskey' => 'm',
 	];
 
-	$tpl = get_markup_template('message_side.tpl');
+	$tpl = Renderer::getMarkupTemplate('message_side.tpl');
 	$a->page['aside'] = Renderer::replaceMacros($tpl, [
 		'$tabs' => $tabs,
 		'$new' => $new,
 	]);
 	$base = System::baseUrl();
 
-	$head_tpl = get_markup_template('message-head.tpl');
+	$head_tpl = Renderer::getMarkupTemplate('message-head.tpl');
 	$a->page['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
 		'$baseurl' => System::baseUrl(true),
 		'$base' => $base
@@ -105,7 +105,7 @@ function message_content(App $a)
 
 	$myprofile = System::baseUrl() . '/profile/' . $a->user['nickname'];
 
-	$tpl = get_markup_template('mail_head.tpl');
+	$tpl = Renderer::getMarkupTemplate('mail_head.tpl');
 	if ($a->argc > 1 && $a->argv[1] == 'new') {
 		$button = [
 			'label' => L10n::t('Discard'),
@@ -144,7 +144,7 @@ function message_content(App $a)
 			}
 
 			//$a->page['aside'] = '';
-			return Renderer::replaceMacros(get_markup_template('confirm.tpl'), [
+			return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
 				'$method' => 'get',
 				'$message' => L10n::t('Do you really want to delete this message?'),
 				'$extra_inputs' => $inputs,
@@ -199,7 +199,7 @@ function message_content(App $a)
 	if (($a->argc > 1) && ($a->argv[1] === 'new')) {
 		$o .= $header;
 
-		$tpl = get_markup_template('msg-header.tpl');
+		$tpl = Renderer::getMarkupTemplate('msg-header.tpl');
 		$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
 			'$baseurl' => System::baseUrl(true),
 			'$nickname' => $a->user['nickname'],
@@ -244,7 +244,7 @@ function message_content(App $a)
 		// the ugly select box
 		$select = ACL::getMessageContactSelectHTML('messageto', 'message-to-select', $preselect, 4, 10);
 
-		$tpl = get_markup_template('prv_message.tpl');
+		$tpl = Renderer::getMarkupTemplate('prv_message.tpl');
 		$o .= Renderer::replaceMacros($tpl, [
 			'$header' => L10n::t('Send Private Message'),
 			'$to' => L10n::t('To:'),
@@ -339,7 +339,7 @@ function message_content(App $a)
 			intval(local_user())
 		);
 
-		$tpl = get_markup_template('msg-header.tpl');
+		$tpl = Renderer::getMarkupTemplate('msg-header.tpl');
 		$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
 			'$baseurl' => System::baseUrl(true),
 			'$nickname' => $a->user['nickname'],
@@ -399,7 +399,7 @@ function message_content(App $a)
 		$select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
 		$parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
 
-		$tpl = get_markup_template('mail_display.tpl');
+		$tpl = Renderer::getMarkupTemplate('mail_display.tpl');
 		$o = Renderer::replaceMacros($tpl, [
 			'$thread_id' => $a->argv[1],
 			'$thread_subject' => $message['title'],
@@ -454,7 +454,7 @@ function render_messages(array $msg, $t)
 {
 	$a = get_app();
 
-	$tpl = get_markup_template($t);
+	$tpl = Renderer::getMarkupTemplate($t);
 	$rslt = '';
 
 	$myprofile = System::baseUrl() . '/profile/' . $a->user['nickname'];

mod/network.php

@@ -201,7 +201,7 @@ function saved_searches($search)
 		];
 	}
 
-	$tpl = get_markup_template('saved_searches_aside.tpl');
+	$tpl = Renderer::getMarkupTemplate('saved_searches_aside.tpl');
 	$o = Renderer::replaceMacros($tpl, [
 		'$title'     => L10n::t('Saved Searches'),
 		'$add'       => L10n::t('add'),
@@ -654,7 +654,7 @@ function networkThreadedView(App $a, $update, $parent)
 			info(L10n::t('Group is empty'));
 		}
 
-		$o = Renderer::replaceMacros(get_markup_template('section_title.tpl'), [
+		$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [
 			'$title' => L10n::t('Group: %s', $group['name'])
 		]) . $o;
 	} elseif ($cid) {
@@ -675,7 +675,7 @@ function networkThreadedView(App $a, $update, $parent)
 
 			$entries[0]['account_type'] = Contact::getAccountType($contact);
 
-			$o = Renderer::replaceMacros(get_markup_template('viewcontact_template.tpl'), [
+			$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('viewcontact_template.tpl'), [
 				'contacts' => $entries,
 				'id' => 'network',
 			]) . $o;
@@ -1033,7 +1033,7 @@ function network_tabs(App $a)
 	$arr = ['tabs' => $tabs];
 	Addon::callHooks('network_tabs', $arr);
 
-	$tpl = get_markup_template('common_tabs.tpl');
+	$tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
 
 	return Renderer::replaceMacros($tpl, ['$tabs' => $arr['tabs']]);
 
@@ -1059,7 +1059,7 @@ function network_infinite_scroll_head(App $a, &$htmlhead)
 	if (PConfig::get(local_user(), 'system', 'infinite_scroll')
 		&& defaults($_GET, 'mode', '') != 'minimal'
 	) {
-		$tpl = get_markup_template('infinite_scroll_head.tpl');
+		$tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
 		$htmlhead .= Renderer::replaceMacros($tpl, [
 			'$pageno'     => $pager->getPage(),
 			'$reload_uri' => $pager->getBaseQueryString()

mod/notifications.php

@@ -133,7 +133,7 @@ function notifications_content(App $a)
 		System::jsonExit($notifs);
 	}
 
-	$notif_tpl = get_markup_template('notifications.tpl');
+	$notif_tpl = Renderer::getMarkupTemplate('notifications.tpl');
 
 	$notif_show_lnk = [
 		'href' => ($show ? 'notifications/' . $notifs['ident'] : 'notifications/' . $notifs['ident'] . '?show=all' ),
@@ -142,8 +142,8 @@ function notifications_content(App $a)
 
 	// Process the data for template creation
 	if (defaults($notifs, 'ident', '') === 'introductions') {
-		$sugg = get_markup_template('suggestions.tpl');
-		$tpl = get_markup_template('intros.tpl');
+		$sugg = Renderer::getMarkupTemplate('suggestions.tpl');
+		$tpl = Renderer::getMarkupTemplate('intros.tpl');
 
 		// The link to switch between ignored and normal connection requests
 		$notif_show_lnk = [
@@ -209,7 +209,7 @@ function notifications_content(App $a)
 						$helptext3 = L10n::t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']);
 					}
 
-					$dfrn_tpl = get_markup_template('netfriend.tpl');
+					$dfrn_tpl = Renderer::getMarkupTemplate('netfriend.tpl');
 					$dfrn_text = Renderer::replaceMacros($dfrn_tpl, [
 						'$intro_id'    => $notif['intro_id'],
 						'$friend_selected' => $friend_selected,
@@ -294,7 +294,7 @@ function notifications_content(App $a)
 				'notify'      => 'notify.tpl',
 			];
 
-			$tpl_notif = get_markup_template($notification_templates[$notif['label']]);
+			$tpl_notif = Renderer::getMarkupTemplate($notification_templates[$notif['label']]);
 
 			$notif_content[] = Renderer::replaceMacros($tpl_notif, [
 				'$item_label' => $notif['label'],

mod/notify.php

@@ -60,9 +60,9 @@ function notify_content(App $a)
 
 	$nm = new NotificationsManager();
 
-	$notif_tpl = get_markup_template('notifications.tpl');
+	$notif_tpl = Renderer::getMarkupTemplate('notifications.tpl');
 
-	$not_tpl = get_markup_template('notify.tpl');
+	$not_tpl = Renderer::getMarkupTemplate('notify.tpl');
 
 	$r = $nm->getAll(['seen'=>0]);
 	if (DBA::isResult($r) > 0) {

mod/oexchange.php

@@ -12,7 +12,7 @@ use Friendica\Util\Network;
 function oexchange_init(App $a) {
 
 	if (($a->argc > 1) && ($a->argv[1] === 'xrd')) {
-		$tpl = get_markup_template('oexchange_xrd.tpl');
+		$tpl = Renderer::getMarkupTemplate('oexchange_xrd.tpl');
 
 		$o = Renderer::replaceMacros($tpl, ['$base' => System::baseUrl()]);
 		echo $o;

mod/opensearch.php

@@ -6,7 +6,7 @@ use Friendica\Core\System;
 
 function opensearch_content(App $a) {
 
-	$tpl = get_markup_template('opensearch.tpl');
+	$tpl = Renderer::getMarkupTemplate('opensearch.tpl');
 
 	header("Content-type: application/opensearchdescription+xml");
 

mod/photos.php

@@ -63,7 +63,7 @@ function photos_init(App $a) {
 
 		$account_type = Contact::getAccountType($profile);
 
-		$tpl = get_markup_template("vcard-widget.tpl");
+		$tpl = Renderer::getMarkupTemplate("vcard-widget.tpl");
 
 		$vcard_widget = Renderer::replaceMacros($tpl, [
 			'$name' => $profile['name'],
@@ -110,7 +110,7 @@ function photos_init(App $a) {
 		}
 
 		if ($ret['success']) {
-			$photo_albums_widget = Renderer::replaceMacros(get_markup_template('photo_albums.tpl'), [
+			$photo_albums_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('photo_albums.tpl'), [
 				'$nick'     => $a->data['user']['nickname'],
 				'$title'    => L10n::t('Photo Albums'),
 				'$recent'   => L10n::t('Recent Photos'),
@@ -131,7 +131,7 @@ function photos_init(App $a) {
 			$a->page['aside'] .= $photo_albums_widget;
 		}
 
-		$tpl = get_markup_template("photos_head.tpl");
+		$tpl = Renderer::getMarkupTemplate("photos_head.tpl");
 
 		$a->page['htmlhead'] .= Renderer::replaceMacros($tpl,[
 			'$ispublic' => L10n::t('everybody')
@@ -247,7 +247,7 @@ function photos_post(App $a)
 					['name' => 'albumname', 'value' => $_POST['albumname']],
 				];
 
-				$a->page['content'] = Renderer::replaceMacros(get_markup_template('confirm.tpl'), [
+				$a->page['content'] = Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
 					'$method' => 'post',
 					'$message' => L10n::t('Do you really want to delete this photo album and all its photos?'),
 					'$extra_inputs' => $extra_inputs,
@@ -319,7 +319,7 @@ function photos_post(App $a)
 		if (!empty($_REQUEST['confirm'])) {
 			$drop_url = $a->query_string;
 
-			$a->page['content'] = Renderer::replaceMacros(get_markup_template('confirm.tpl'), [
+			$a->page['content'] = Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
 				'$method' => 'post',
 				'$message' => L10n::t('Do you really want to delete this photo?'),
 				'$extra_inputs' => [],
@@ -1085,14 +1085,14 @@ function photos_content(App $a)
 
 		Addon::callHooks('photo_upload_form',$ret);
 
-		$default_upload_box = Renderer::replaceMacros(get_markup_template('photos_default_uploader_box.tpl'), []);
-		$default_upload_submit = Renderer::replaceMacros(get_markup_template('photos_default_uploader_submit.tpl'), [
+		$default_upload_box = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_box.tpl'), []);
+		$default_upload_submit = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_submit.tpl'), [
 			'$submit' => L10n::t('Submit'),
 		]);
 
 		$usage_message = '';
 
-		$tpl = get_markup_template('photos_upload.tpl');
+		$tpl = Renderer::getMarkupTemplate('photos_upload.tpl');
 
 		$aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML($a->user));
 
@@ -1166,7 +1166,7 @@ function photos_content(App $a)
 		if ($cmd === 'edit') {
 			if (($album !== L10n::t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== L10n::t('Contact Photos'))) {
 				if ($can_post) {
-					$edit_tpl = get_markup_template('album_edit.tpl');
+					$edit_tpl = Renderer::getMarkupTemplate('album_edit.tpl');
 
 					$album_e = $album;
 
@@ -1220,7 +1220,7 @@ function photos_content(App $a)
 			}
 		}
 
-		$tpl = get_markup_template('photo_album.tpl');
+		$tpl = Renderer::getMarkupTemplate('photo_album.tpl');
 		$o .= Renderer::replaceMacros($tpl, [
 			'$photos' => $photos,
 			'$album' => $album,
@@ -1342,7 +1342,7 @@ function photos_content(App $a)
 		}
 
 		if ($cmd === 'edit') {
-			$tpl = get_markup_template('photo_edit_head.tpl');
+			$tpl = Renderer::getMarkupTemplate('photo_edit_head.tpl');
 			$a->page['htmlhead'] .= Renderer::replaceMacros($tpl,[
 				'$prevlink' => $prevlink,
 				'$nextlink' => $nextlink
@@ -1429,7 +1429,7 @@ function photos_content(App $a)
 
 		$edit = Null;
 		if ($cmd === 'edit' && $can_post) {
-			$edit_tpl = get_markup_template('photo_edit.tpl');
+			$edit_tpl = Renderer::getMarkupTemplate('photo_edit.tpl');