From c052d688284fda76c612325b237d8352f2abb5d4 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 10 May 2011 16:12:50 -0700 Subject: don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version. --- include/conversation.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'include/conversation.php') diff --git a/include/conversation.php b/include/conversation.php index 775234284..d3744e21f 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 = load_view_file('view/comment_item.tpl'); - $like_tpl = load_view_file('view/like.tpl'); - $noshare_tpl = load_view_file('view/like_noshare.tpl'); - $tpl = load_view_file('view/wall_item.tpl'); - $wallwall = load_view_file('view/wallwall_item.tpl'); + $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 = file_get_contents('view/wall_item.tpl'); + $wallwall = file_get_contents('view/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 = load_view_file('view/wall_fake_drop.tpl'); + $tpl = file_get_contents('view/search_item.tpl'); + $droptpl = file_get_contents('view/wall_fake_drop.tpl'); foreach($items as $item) { @@ -383,7 +383,7 @@ function conversation(&$a, $items, $mode, $update) { ? '' : ''); - $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); + $drop = replace_macros(file_get_contents('view/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']) ? load_view_file('view/jot_geotag.tpl') : ''); + $geotag = (($x['allow_location']) ? file_get_contents('view/jot_geotag.tpl') : ''); - $tpl = load_view_file('view/jot-header.tpl'); + $tpl = file_get_contents('view/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 = file_get_contents("view/jot.tpl"); $jotplugins = ''; $jotnets = ''; -- cgit v1.2.3