deprecate load_view_file

7 files changed, 19 insertions, 19 deletions

diff --git a/include/api.php b/include/api.php
index 0753962ab..84cb7b38f 100644
--- a/include/api.php
+++ b/include/api.php
@@ -273,7 +273,7 @@
 			case "atom":
 			case "xml":
 				$data = api_xmlify($data);
-				$tpl = file_get_contents("view/api_".$templatename."_".$type.".tpl");
+				$tpl = get_markup_template("api_".$templatename."_".$type.".tpl");
 				$ret = replace_macros($tpl, $data);
 				break;
 			case "json":
diff --git a/include/conversation.php b/include/conversation.php
index 7af7c1efd..a58a4d638 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -104,11 +104,11 @@ function conversation(&$a, $items, $mode, $update) {
 	load_contact_links(local_user());
 
 
-	$cmnt_tpl    = file_get_contents('view/comment_item.tpl');
-	$like_tpl    = file_get_contents('view/like.tpl');
-	$noshare_tpl = file_get_contents('view/like_noshare.tpl');
-	$tpl         = load_view_file('view/wall_item.tpl');
-	$wallwall    = load_view_file('view/wallwall_item.tpl');
+	$cmnt_tpl    = get_markup_template('comment_item.tpl');
+	$like_tpl    = get_markup_template('like.tpl');
+	$noshare_tpl = get_markup_template('like_noshare.tpl');
+	$tpl         = get_markup_template('wall_item.tpl');
+	$wallwall    = get_markup_template('wallwall_item.tpl');
 
 	$alike = array();
 	$dlike = array();
@@ -120,8 +120,8 @@ function conversation(&$a, $items, $mode, $update) {
 			// "New Item View" on network page or search page results 
 			// - just loop through the items and format them minimally for display
 
-			$tpl = load_view_file('view/search_item.tpl');
-			$droptpl = file_get_contents('view/wall_fake_drop.tpl');
+			$tpl = get_markup_template('search_item.tpl');
+			$droptpl = get_markup_template('wall_fake_drop.tpl');
 
 			foreach($items as $item) {
 
@@ -383,7 +383,7 @@ function conversation(&$a, $items, $mode, $update) {
 					? '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] 
 						. '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>'
 					: '');
-			$drop = replace_macros(file_get_contents('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+			$drop = replace_macros(get_markup_template('wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
 			$photo = $item['photo'];
 			$thumb = $item['thumb'];
@@ -662,9 +662,9 @@ function status_editor($a,$x) {
 
 	$o = '';
 		
-	$geotag = (($x['allow_location']) ? file_get_contents('view/jot_geotag.tpl') : '');
+	$geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
 
-		$tpl = load_view_file('view/jot-header.tpl');
+		$tpl = get_markup_template('jot-header.tpl');
 	
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$baseurl' => $a->get_baseurl(),
@@ -680,7 +680,7 @@ function status_editor($a,$x) {
 		));
 
 
-		$tpl = load_view_file("view/jot.tpl");
+		$tpl = get_markup_template("jot.tpl");
 		
 		$jotplugins = '';
 		$jotnets = '';
diff --git a/include/items.php b/include/items.php
index c75e509cf..6f15b6814 100644
--- a/include/items.php
+++ b/include/items.php
@@ -113,7 +113,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 
 	$items = $r;
 
-	$feed_template = file_get_contents('view/atom_feed.tpl');
+	$feed_template = get_markup_template('atom_feed.tpl');
 
 	$atom = '';
 
@@ -1421,7 +1421,7 @@ function new_follower($importer,$contact,$datarray,$item) {
 		$a = get_app();
 		if(count($r)) {
 			if(($r[0]['notify-flags'] & NOTIFY_INTRO) && ($r[0]['page-flags'] == PAGE_NORMAL)) {
-				$email_tpl = load_view_file('view/follow_notify_eml.tpl');
+				$email_tpl = get_intltext_template('follow_notify_eml.tpl');
 				$email = replace_macros($email_tpl, array(
 					'$requestor' => ((strlen($name)) ? $name : t('[Name Withheld]')),
 					'$url' => $url,
diff --git a/include/nav.php b/include/nav.php
index 2ead5c07e..d8f7621cc 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -125,7 +125,7 @@ function nav(&$a) {
 		$banner .= '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>';
 
 
-	$tpl = load_view_file('view/nav.tpl');
+	$tpl = get_markup_template('nav.tpl');
 
 	$a->page['nav'] .= replace_macros($tpl, array(
 		'$langselector' => lang_selector(),
diff --git a/include/notifier.php b/include/notifier.php
index bd061a0c6..db2542849 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -191,8 +191,8 @@ function notifier_run($argv, $argc){
 			$contacts = $r;
 	}
 
-	$feed_template = file_get_contents('view/atom_feed.tpl');
-	$mail_template = file_get_contents('view/atom_mail.tpl');
+	$feed_template = get_markup_template('atom_feed.tpl');
+	$mail_template = get_markup_template('atom_mail.tpl');
 
 	$atom = '';
 	$slaps = array();
diff --git a/include/salmon.php b/include/salmon.php
index b96ca774f..d7060b0f7 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -161,7 +161,7 @@ EOT;
 
 	$signature2  = base64url_encode($rsa->sign($data));
 
-	$salmon_tpl = file_get_contents('view/magicsig.tpl');
+	$salmon_tpl = get_markup_template('magicsig.tpl');
 	$salmon = replace_macros($salmon_tpl,array(
 		'$data'      => $data,
 		'$encoding'  => $encoding,
diff --git a/include/template_processor.php b/include/template_processor.php
index d1ff3998f..d431831cb 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -86,7 +86,7 @@
 				$r[$a] = $this->_get_var($b); 
 			}
 			$this->nodes = Array();
-			$tpl = load_view_file($tplfile);
+			$tpl = get_markup_template($tplfile);
 			$ret = $this->replace($tpl, $r);
 			$this->_pop_stack();
 			return $ret;