bring back load_view_file for dispy templates

diff --git a/include/conversation.php b/include/conversation.php
index d3744e21f5418c2ec6e93e3e981e9c9b4bd34627..7af7c1efd0beed11aa2bc3134b6848a0fdd43c63 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -107,8 +107,8 @@ function conversation(&$a, $items, $mode, $update) {
        $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');
+       $tpl         = load_view_file('view/wall_item.tpl');
+       $wallwall    = load_view_file('view/wallwall_item.tpl');
 
        $alike = array();
        $dlike = array();
@@ -120,7 +120,7 @@ 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 = file_get_contents('view/search_item.tpl');
+                       $tpl = load_view_file('view/search_item.tpl');
                        $droptpl = file_get_contents('view/wall_fake_drop.tpl');
 
                        foreach($items as $item) {
@@ -664,7 +664,7 @@ function status_editor($a,$x) {
                
        $geotag = (($x['allow_location']) ? file_get_contents('view/jot_geotag.tpl') : '');
 
-               $tpl = file_get_contents('view/jot-header.tpl');
+               $tpl = load_view_file('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 = file_get_contents("view/jot.tpl");
+               $tpl = load_view_file("view/jot.tpl");
                
                $jotplugins = '';
                $jotnets = '';

diff --git a/include/nav.php b/include/nav.php
index 602385c32c448d622c1e0573ba48f4350cba0790..2ead5c07e9465db1167faf36b6ad2aa0557593a2 100644 (file)
--- 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 = file_get_contents('view/nav.tpl');
+       $tpl = load_view_file('view/nav.tpl');
 
        $a->page['nav'] .= replace_macros($tpl, array(
                '$langselector' => lang_selector(),

diff --git a/mod/editpost.php b/mod/editpost.php
index 523f64fd2703b884ef7d82e3ce4fd131ba311bd3..fd84fc26d5a4ba24f9ba386315221524854f7741 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -31,7 +31,7 @@ function editpost_content(&$a) {
 
        $o .= '<h2>' . t('Edit post') . '</h2>';
 
-       $tpl = file_get_contents('view/jot-header.tpl');
+       $tpl = load_view_file('view/jot-header.tpl');
        
        $a->page['htmlhead'] .= replace_macros($tpl, array(
                '$baseurl' => $a->get_baseurl(),
@@ -41,7 +41,7 @@ function editpost_content(&$a) {
        ));
 
 
-       $tpl = file_get_contents("view/jot.tpl");
+       $tpl = load_view_file("view/jot.tpl");
                
        if(($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))))
                $lockstate = 'lock';

diff --git a/mod/message.php b/mod/message.php
index 0f56502566b0c90d065755d412a8d1acdf631abc..3a59359ce2f3c934f1eef5b2f754a6c88cdcea64 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -120,7 +120,7 @@ function message_content(&$a) {
        $myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
 
 
-       $tpl = file_get_contents('view/mail_head.tpl');
+       $tpl = load_view_file('view/mail_head.tpl');
        $header = replace_macros($tpl, array(
                '$messages' => t('Messages'),
                '$inbox' => t('Inbox'),

diff --git a/mod/photos.php b/mod/photos.php
index b10399215a8c804892c03604255ce29777ed634a..70bb5ff3de0f4fa7bf9221887d7f3ce0510847f2 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1247,7 +1247,7 @@ function photos_content(&$a) {
                        $paginate = paginate($a);
                }
                
-               $photo_tpl = file_get_contents('view/photo_view.tpl');
+               $photo_tpl = load_view_file('view/photo_view.tpl');
                $o .= replace_macros($photo_tpl, array(
                        '$id' => $ph[0]['id'],
                        '$album' => array($album_link,$ph[0]['album']),

diff --git a/mod/profile.php b/mod/profile.php
index 0691c64b33f6e10181a8dd5a784d8c560de4e42f..2af6f2429bb1033fa5694cf5f0ce8a18ca64c8a6 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -104,7 +104,7 @@ function profile_content(&$a, $update = 0) {
                if(x($_GET,'tab'))
                        $tab = notags(trim($_GET['tab']));
 
-               $tpl = file_get_contents('view/profile_tabs.tpl');
+               $tpl = load_view_file('view/profile_tabs.tpl');
 
                $o .= replace_macros($tpl,array(
                        '$url' => $a->get_baseurl() . '/' . $a->cmd,

diff --git a/mod/settings.php b/mod/settings.php
index 22dc794dc054ff9b31ab4993419a7e72fe4f6072..99fe852eeb5331e07f5f0ae32c7783e72fd3d385 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -406,7 +406,7 @@ function settings_content(&$a) {
                '$basepath' => $a->get_hostname()
        ));
 
-       $stpl = file_get_contents('view/settings.tpl');
+       $stpl = load_view_file('view/settings.tpl');
 
        $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);