deprecate load_view_file

diff --git a/boot.php b/boot.php
index c9b22bbb8b41000d68091b9def2bc0f02bb03971..84e252eb1bec8c05bb43ce1ea10a0beffb2c0d03 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -828,7 +828,7 @@ function escape_tags($string) {
 if(! function_exists('login')) {
 function login($register = false) {
        $o = "";
-       $register_tpl = (($register) ? file_get_contents("view/register-link.tpl") : "");
+       $register_tpl = (($register) ? get_markup_template("register-link.tpl") : "");
        
        $register_html = replace_macros($register_tpl,array(
                '$title' => t('Create a New Account'),
@@ -852,10 +852,10 @@ function login($register = false) {
        $lostlink = t('Password Reset');
 
        if(local_user()) {
-               $tpl = file_get_contents("view/logout.tpl");
+               $tpl = get_markup_template("logout.tpl");
        }
        else {
-               $tpl = file_get_contents("view/login.tpl");
+               $tpl = get_markup_template("login.tpl");
 
        }
 
@@ -1864,6 +1864,8 @@ function allowed_email($email) {
 // wrapper to load a view template, checking for alternate
 // languages before falling back to the default
 
+// obsolete, deprecated.
+
 if(! function_exists('load_view_file')) {
 function load_view_file($s) {
        global $lang, $a;
@@ -1882,6 +1884,37 @@ function load_view_file($s) {
        return file_get_contents($s);
 }}
 
+if(! function_exists('get_intltext_template')) {
+function get_intltext_template($s) {
+       global $lang;
+
+       if(! isset($lang))
+               $lang = 'en';
+
+       if(file_exists("view/$lang/$s"))
+               return file_get_contents("view/$lang/$s");
+       elseif(file_exists("view/en/$s"))
+               return file_get_contents("view/en/$s");
+       else
+               return file_get_contents("view/$s");
+}}
+
+if(! function_exists('get_markup_template')) {
+function get_markup_template($s) {
+
+       $theme = current_theme();
+       
+       if(file_exists("view/theme/$theme/$s"))
+               return file_get_contents("view/theme/$theme/$s");
+       else
+               return file_get_contents("view/$s");
+
+}}
+
+
+
+
+
 // for html,xml parsing - let's say you've got
 // an attribute foobar="class1 class2 class3"
 // and you want to find out if it contains 'class3'.
@@ -2307,7 +2340,7 @@ function profile_sidebar($profile) {
 
        $homepage = ((x($profile,'homepage') == 1) ? '<div class="homepage"><span class="homepage-label">' . t('Homepage:') . ' </span><span class="homepage-url">' . linkify($profile['homepage']) . '</span></div><div class="profile-clear"></div>' : '');
 
-       $tpl = file_get_contents('view/profile_vcard.tpl');
+       $tpl = get_markup_template('profile_vcard.tpl');
 
        $o .= replace_macros($tpl, array(
                '$fullname' => $fullname,

diff --git a/include/api.php b/include/api.php
index 0753962ab983621a0db8985afff378e50807dc03..84cb7b38f623e70e9a7f6a6f8273d230ddbc5965 100644 (file)
--- 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 7af7c1efd0beed11aa2bc3134b6848a0fdd43c63..a58a4d63868357d0e3947dc67defe8732b0b5185 100644 (file)
--- 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 c75e509cf360724599a3926bec65fc06f3cafef6..6f15b6814b9a73377dbd33aec49160c888440482 100644 (file)
--- 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 2ead5c07e9465db1167faf36b6ad2aa0557593a2..d8f7621cc8ed30655f0bd3644986f33b5ebd3f4b 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 = 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 bd061a0c6ea356137112135d110d5539ea35a3dc..db2542849d1d1d721171609dd1b11e385b92480d 100644 (file)
--- 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 b96ca774f5a14bf2b8626a467d83d78cee61812e..d7060b0f7a583cb48296c1c2d123f9fd105f0be2 100644 (file)
--- 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 d1ff3998f0c84f0cf70a37a2d564a559da68e8f7..d431831cb784fc5733afb5f19fd192ba06160134 100644 (file)
--- 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;

diff --git a/mod/contacts.php b/mod/contacts.php
index df75ab2dd95065b18283df668b5d8722643bd5bc..0ad0d217f0eb30449d4746efa24b09c2984e2931 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -14,7 +14,7 @@ function contacts_init(&$a) {
        if(strlen(get_config('system','directory_submit_url')))
                $a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >' . t('Find People With Shared Interests') . '</a></div>';
 
-       $tpl = file_get_contents('view/follow.tpl');
+       $tpl = get_markup_template('follow.tpl');
        $a->page['aside'] .= replace_macros($tpl,array(
                '$label' => t('Connect/Follow'),
                '$hint' => t('Example: bob@example.com, http://example.com/barbara'),
@@ -168,7 +168,7 @@ function contacts_content(&$a) {
                        // create an unfollow slap
 
                        if($orig_record[0]['network'] === 'stat') {
-                               $tpl = file_get_contents('view/follow_slap.tpl');
+                               $tpl = get_markup_template('follow_slap.tpl');
                                $slap = replace_macros($tpl, array(
                                        '$name' => $a->user['username'],
                                        '$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
@@ -215,12 +215,12 @@ function contacts_content(&$a) {
                        return;
                }
 
-               $tpl = file_get_contents('view/contact_head.tpl');
+               $tpl = get_markup_template('contact_head.tpl');
                $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
 
                require_once('include/contact_selectors.php');
 
-               $tpl = file_get_contents("view/contact_edit.tpl");
+               $tpl = get_markup_template("contact_edit.tpl");
 
                switch($r[0]['rel']) {
                        case REL_BUD:
@@ -317,7 +317,7 @@ function contacts_content(&$a) {
 
        $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
 
-       $tpl = file_get_contents("view/contacts-top.tpl");
+       $tpl = get_markup_template("contacts-top.tpl");
        $o .= replace_macros($tpl,array(
                '$header' => t('Contacts'),
                '$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ),
@@ -351,7 +351,7 @@ function contacts_content(&$a) {
 
        if(count($r)) {
 
-               $tpl = file_get_contents("view/contact_template.tpl");
+               $tpl = get_markup_template("contact_template.tpl");
 
                foreach($r as $rr) {
                        if($rr['self'])

diff --git a/mod/crepair.php b/mod/crepair.php
index fa50e7219c20706fa2d591ce6f5f4c33609f3d4a..01b88d37a237a2b917466f56d07b6a5a1f401f72 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -80,7 +80,7 @@ function crepair_content(&$a) {
 
        $o .= '<div class="error-message">' . $msg2 . EOL . EOL. $msg3 . '</div>';
 
-       $tpl = file_get_contents('view/crepair.tpl');
+       $tpl = get_markup_template('crepair.tpl');
        $o .= replace_macros($tpl, array(
                '$label_name' => t('Name'),
                '$label_nick' => t('Account Nickname'),

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index d0543ac8459b7fc49675f5dbe74efb9473645ae1..4e2a70e048f8978e94df92aa6d367ed370d2a539 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -639,8 +639,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
 
                        $tpl = (($new_relation == REL_BUD) 
-                               ? load_view_file('view/friend_complete_eml.tpl')
-                               : load_view_file('view/intro_complete_eml.tpl'));
+                               ? get_intltext_template('friend_complete_eml.tpl')
+                               : get_intltext_template('intro_complete_eml.tpl'));
                
                        $email_tpl = replace_macros($tpl, array(
                                '$sitename' => $a->config['sitename'],

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index eb9d71fe3f3cb5d5093f6e1c7c08a488e6bf70b0..9ea9803385de82e046677178baffa492571406d0 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -210,7 +210,7 @@ function dfrn_notify_post(&$a) {
                                = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$msg['body']))));
 
                        // load the template for private message notifications
-                       $tpl = load_view_file('view/mail_received_html_body_eml.tpl');
+                       $tpl = get_intltext_template('mail_received_html_body_eml.tpl');
                        $email_html_body_tpl = replace_macros($tpl,array(
                                '$siteName'             => $a->config['sitename'],                              // name of this site
                                '$siteurl'              => $a->get_baseurl(),                                   // descriptive url of this site
@@ -225,7 +225,7 @@ function dfrn_notify_post(&$a) {
                        ));
                        
                        // load the template for private message notifications
-                       $tpl = load_view_file('view/mail_received_text_body_eml.tpl');
+                       $tpl = get_intltext_template('mail_received_text_body_eml.tpl');
                        $email_text_body_tpl = replace_macros($tpl,array(
                                '$siteName'             => $a->config['sitename'],                              // name of this site
                                '$siteurl'              => $a->get_baseurl(),                                   // descriptive url of this site
@@ -389,7 +389,7 @@ function dfrn_notify_post(&$a) {
                                                if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) {
                                                        require_once('bbcode.php');
                                                        $from = stripslashes($datarray['author-name']);
-                                                       $tpl = load_view_file('view/cmnt_received_eml.tpl');                    
+                                                       $tpl = get_intltext_template('cmnt_received_eml.tpl');                  
                                                        $email_tpl = replace_macros($tpl, array(
                                                                '$sitename' => $a->config['sitename'],
                                                                '$siteurl' =>  $a->get_baseurl(),
@@ -479,7 +479,7 @@ function dfrn_notify_post(&$a) {
                                                                continue;
                                                        require_once('bbcode.php');
                                                        $from = stripslashes($datarray['author-name']);
-                                                       $tpl = load_view_file('view/cmnt_received_eml.tpl');    
+                                                       $tpl = get_intltext_template('cmnt_received_eml.tpl');  
                                                        $email_tpl = replace_macros($tpl, array(
                                                                '$sitename' => $a->config['sitename'],
                                                                '$siteurl' =>  $a->get_baseurl(),

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index f1807c738ca3d8b6f8b8f43b630b6849fd172b97..8b44d22baa107108c8a4ed9746ddb48334c30ab6 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -499,8 +499,8 @@ function dfrn_request_content(&$a) {
                $dfrn_url = notags(trim(hex2bin($_GET['dfrn_url'])));
                $aes_allow = (((x($_GET,'aes_allow')) && ($_GET['aes_allow'] == 1)) ? 1 : 0);
                $confirm_key = (x($_GET,'confirm_key') ? $_GET['confirm_key'] : "");
-               $o .= file_get_contents("view/dfrn_req_confirm.tpl");
-               $o  = replace_macros($o,array(
+               $tpl = get_markup_template("dfrn_req_confirm.tpl");
+               $o  = replace_macros($tpl,array(
                        '$dfrn_url' => $dfrn_url,
                        '$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
                        '$confirm_key' => $confirm_key,
@@ -537,7 +537,7 @@ function dfrn_request_content(&$a) {
                                if($r[0]['page-flags'] != PAGE_NORMAL)
                                        $auto_confirm = true;                           
                                if(($r[0]['notify-flags'] & NOTIFY_INTRO) && (! $auto_confirm)) {
-                                       $email_tpl = load_view_file('view/request_notify_eml.tpl');
+                                       $email_tpl = get_intltext_template('request_notify_eml.tpl');
                                        $email = replace_macros($email_tpl, array(
                                                '$requestor' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
                                                '$url' => stripslashes($r[0]['url']),
@@ -622,9 +622,9 @@ function dfrn_request_content(&$a) {
                 */
 
                if($a->profile['page-flags'] == PAGE_NORMAL)
-                       $tpl = file_get_contents('view/dfrn_request.tpl');
+                       $tpl = get_markup_template('dfrn_request.tpl');
                else
-                       $tpl = file_get_contents('view/auto_request.tpl');
+                       $tpl = get_markup_template('auto_request.tpl');
 
                $o .= replace_macros($tpl,array(
                        '$header' => t('Friend/Connection Request'),

diff --git a/mod/directory.php b/mod/directory.php
index a83eae3f0be957cb6f065b316c7490bfc54a79fc..77fdb30a4698874f40ce3ddff9225d3292d2f1a0 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -29,7 +29,7 @@ function directory_content(&$a) {
        else
                $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
-       $tpl = file_get_contents('view/directory_header.tpl');
+       $tpl = get_markup_template('directory_header.tpl');
 
        $globaldir = '';
        $gdirpath = dirname(get_config('system','directory_submit_url'));
@@ -65,7 +65,7 @@ function directory_content(&$a) {
        );
        if(count($r)) {
 
-               $tpl = file_get_contents('view/directory_item.tpl');
+               $tpl = get_markup_template('directory_item.tpl');
 
                if(in_array('small', $a->argv))
                        $photo = 'thumb';

diff --git a/mod/editpost.php b/mod/editpost.php
index fd84fc26d5a4ba24f9ba386315221524854f7741..ab37cfe000f8a232ef5d7f01082217f48e39687c 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 = 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(),
@@ -41,7 +41,7 @@ function editpost_content(&$a) {
        ));
 
 
-       $tpl = load_view_file("view/jot.tpl");
+       $tpl = get_markup_template("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/follow.php b/mod/follow.php
index 2f3cb3c4d7074069714fe9420de6eea299161d5b..5f4ac1df030458730e1b3f3b2a7a3b403ef1efed 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -133,7 +133,7 @@ function follow_post(&$a) {
 
        // create a follow slap
 
-       $tpl = file_get_contents('view/follow_slap.tpl');
+       $tpl = get_markup_template('follow_slap.tpl');
        $slap = replace_macros($tpl, array(
                '$name' => $a->user['username'],
                '$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],

diff --git a/mod/group.php b/mod/group.php
index 2e2c8ab23139c34729aeb40d2fdfbc8bd2ed0905..4873fc3a31a58e6a75b6f2e61630a7d6b90c35a9 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -69,7 +69,7 @@ function group_content(&$a) {
        }
 
        if(($a->argc == 2) && ($a->argv[1] === 'new')) {
-               $tpl = file_get_contents('view/group_new.tpl');
+               $tpl = get_markup_template('group_new.tpl');
                $o .= replace_macros($tpl,array(
                        '$desc' => t('Create a group of contacts/friends.'),
                        '$name' => t('Group Name: '),
@@ -140,7 +140,7 @@ function group_content(&$a) {
                }
 
 
-               $drop_tpl = file_get_contents('view/group_drop.tpl');
+               $drop_tpl = get_markup_template('group_drop.tpl');
                $drop_txt = replace_macros($drop_tpl, array(
                        '$id' => $group['id'],
                        '$delete' => t('Delete')
@@ -148,7 +148,7 @@ function group_content(&$a) {
 
                $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
-               $tpl = file_get_contents('view/group_edit.tpl');
+               $tpl = get_markup_template('group_edit.tpl');
                $o .= replace_macros($tpl, array(
                        '$gid' => $group['id'],
                        '$name' => $group['name'],

diff --git a/mod/install.php b/mod/install.php
index 2db3ae08369e27dfd31c46024bcd3e3e24c6cafa..b5f056df7c0537eeb67709714996ad9a9ebb0bb3 100644 (file)
--- a/mod/install.php
+++ b/mod/install.php
@@ -37,7 +37,7 @@ function install_post(&$a) {
 
        notice( t('Connected to database.') . EOL);
 
-       $tpl = load_view_file('view/htconfig.tpl');
+       $tpl = get_intltext_template('htconfig.tpl');
        $txt = replace_macros($tpl,array(
                '$dbhost' => $dbhost,
                '$dbuser' => $dbuser,
@@ -116,7 +116,7 @@ function install_content(&$a) {
 
        require_once('datetime.php');
 
-       $tpl = file_get_contents('view/install_db.tpl');
+       $tpl = get_markup_template('install_db.tpl');
        $o .= replace_macros($tpl, array(
                '$lbl_01' => t('Friendika Social Network'),
                '$lbl_02' => t('Installation'),

diff --git a/mod/invite.php b/mod/invite.php
index 325ba9fbdefc54d510ff76f597dff2c2736b0b68..b34bb7d74e0ed12e636b79edab355577e244d6f5 100644 (file)
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -55,7 +55,7 @@ function invite_content(&$a) {
                return;
        }
 
-       $tpl = file_get_contents('view/invite.tpl');
+       $tpl = get_markup_template('invite.tpl');
        
        $o = replace_macros($tpl, array(
                '$invite' => t('Send invitations'),

diff --git a/mod/item.php b/mod/item.php
index c4f368fd0d01e8eb7acaef20459851fbd110858e..62899868e7f788848d9215a292cd558b7052b65c 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -464,7 +464,7 @@ function item_post(&$a) {
                        if(($user['notify-flags'] & NOTIFY_COMMENT) && ($contact_record != $author)) {
                                require_once('bbcode.php');
                                $from = $author['name'];
-                               $tpl = load_view_file('view/cmnt_received_eml.tpl');                    
+                               $tpl = get_intltext_template('cmnt_received_eml.tpl');                  
                                $email_tpl = replace_macros($tpl, array(
                                        '$sitename' => $a->config['sitename'],
                                        '$siteurl' =>  $a->get_baseurl(),
@@ -490,7 +490,7 @@ function item_post(&$a) {
                        if(($user['notify-flags'] & NOTIFY_WALL) && ($contact_record != $author)) {
                                require_once('bbcode.php');
                                $from = $author['name'];
-                               $tpl = load_view_file('view/wall_received_eml.tpl');                    
+                               $tpl = get_intltext_template('wall_received_eml.tpl');                  
                                $email_tpl = replace_macros($tpl, array(
                                        '$sitename' => $a->config['sitename'],
                                        '$siteurl' =>  $a->get_baseurl(),

diff --git a/mod/lostpass.php b/mod/lostpass.php
index 9a1cf4a9d62a27554f54253ae002c98fdb2f516f..530619bc4f7fa484c29be5a5a6166fb57a5d9789 100644 (file)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -26,7 +26,7 @@ function lostpass_post(&$a) {
        if($r)
                notice( t('Password reset request issued. Check your email.') . EOL);
 
-       $email_tpl = load_view_file("view/lostpass_eml.tpl");
+       $email_tpl = get_intltext_template("lostpass_eml.tpl");
        $email_tpl = replace_macros($email_tpl, array(
                        '$sitename' => $a->config['sitename'],
                        '$siteurl' =>  $a->get_baseurl(),
@@ -73,7 +73,7 @@ function lostpass_content(&$a) {
                        intval($uid)
                );
                if($r) {
-                       $tpl = file_get_contents('view/pwdreset.tpl');
+                       $tpl = get_markup_template('pwdreset.tpl');
                        $o .= replace_macros($tpl,array(
                                '$lbl1' => t('Password Reset'),
                                '$lbl2' => t('Your password has been reset as requested.'),
@@ -89,7 +89,7 @@ function lostpass_content(&$a) {
 
 
 
-                       $email_tpl = load_view_file("view/passchanged_eml.tpl");
+                       $email_tpl = get_intltext_template("passchanged_eml.tpl");
                        $email_tpl = replace_macros($email_tpl, array(
                        '$sitename' => $a->config['sitename'],
                        '$siteurl' =>  $a->get_baseurl(),
@@ -108,7 +108,7 @@ function lostpass_content(&$a) {
        
        }
        else {
-               $tpl = file_get_contents('view/lostpass.tpl');
+               $tpl = get_markup_template('lostpass.tpl');
 
                $o .= replace_macros($tpl,array(
                        '$title' => t('Forgot your Password?'),

diff --git a/mod/message.php b/mod/message.php
index 3a59359ce2f3c934f1eef5b2f754a6c88cdcea64..c9ff3bb8e42737fbe9cff4ef06affd7fbe72e48d 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 = load_view_file('view/mail_head.tpl');
+       $tpl = get_markup_template('mail_head.tpl');
        $header = replace_macros($tpl, array(
                '$messages' => t('Messages'),
                '$inbox' => t('Inbox'),
@@ -164,7 +164,7 @@ function message_content(&$a) {
 
        if(($a->argc > 1) && ($a->argv[1] === 'new')) {
                
-               $tpl = file_get_contents('view/msg-header.tpl');
+               $tpl = get_markup_template('msg-header.tpl');
 
                $a->page['htmlhead'] .= replace_macros($tpl, array(
                        '$baseurl' => $a->get_baseurl(),
@@ -175,7 +175,7 @@ function message_content(&$a) {
                $preselect = (isset($a->argv[2])?array($a->argv[2]):false);
        
                $select = contact_select('messageto','message-to-select', $preselect, 4, true);
-               $tpl = file_get_contents('view/prv_message.tpl');
+               $tpl = get_markup_template('prv_message.tpl');
                $o .= replace_macros($tpl,array(
                        '$header' => t('Send Private Message'),
                        '$to' => t('To:'),
@@ -225,7 +225,7 @@ function message_content(&$a) {
                        return $o;
                }
 
-               $tpl = file_get_contents('view/mail_list.tpl');
+               $tpl = get_markup_template('mail_list.tpl');
                foreach($r as $rr) {
                        $o .= replace_macros($tpl, array(
                                '$id' => $rr['id'],
@@ -275,7 +275,7 @@ function message_content(&$a) {
 
                require_once("include/bbcode.php");
 
-               $tpl = file_get_contents('view/msg-header.tpl');
+               $tpl = get_markup_template('msg-header.tpl');
        
                $a->page['htmlhead'] .= replace_macros($tpl, array(
                        '$nickname' => $a->user['nickname'],
@@ -283,7 +283,7 @@ function message_content(&$a) {
                ));
 
 
-               $tpl = file_get_contents('view/mail_conv.tpl');
+               $tpl = get_markup_template('mail_conv.tpl');
                foreach($messages as $message) {
                        if($message['from-url'] == $myprofile) {
                                $from_url = $myprofile;
@@ -309,7 +309,7 @@ function message_content(&$a) {
                }
                $select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
                $parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
-               $tpl = file_get_contents('view/prv_message.tpl');
+               $tpl = get_markup_template('prv_message.tpl');
                $o .= replace_macros($tpl,array(
                        '$header' => t('Send Reply'),
                        '$to' => t('To:'),

diff --git a/mod/notifications.php b/mod/notifications.php
index 0c695d0b4799245c4715d522e7de2b9bcb87a796..fa5165b0bb5951d1205c101805e32676349205d5 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -89,13 +89,13 @@ function notifications_content(&$a) {
        if(($r !== false) && (count($r))) {
 
 
-               $tpl = file_get_contents("view/intros.tpl");
+               $tpl = get_markup_template("intros.tpl");
 
                foreach($r as $rr) {
 
                        $friend_selected = (($rr['network'] !== 'stat') ? ' checked="checked" ' : ' disabled ');
                        $fan_selected = (($rr['network'] === 'stat') ? ' checked="checked" disabled ' : '');
-                       $dfrn_tpl = file_get_contents('view/netfriend.tpl');
+                       $dfrn_tpl = get_markup_template('netfriend.tpl');
 
                        $knowyou   = '';
                        $dfrn_text = '';

diff --git a/mod/oexchange.php b/mod/oexchange.php
index f77cc5262f32a2b606b7f5e70c650cf5640531e5..d5af4813bac5ddd2fbd93074c9eae457042cce8b 100644 (file)
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -4,7 +4,7 @@
 function oexchange_init(&$a) {
 
        if(($a->argc > 1) && ($a->argv[1] === 'xrd')) {
-               $tpl = file_get_contents('view/oexchange_xrd.tpl');
+               $tpl = get_markup_template('oexchange_xrd.tpl');
 
                $o = replace_macros($tpl, array('$base' => $a->get_baseurl()));
                echo $o;

diff --git a/mod/opensearch.php b/mod/opensearch.php
index a264bf977e2420da7a02c92f2daecaab285a06c9..ff748d1c5360cbc2a0d28ade8d196a8a7b7fe5df 100644 (file)
--- a/mod/opensearch.php
+++ b/mod/opensearch.php
@@ -1,7 +1,7 @@
 <?php
     function opensearch_content(&$a) {
        
-               $tpl = file_get_contents('view/opensearch.tpl');
+               $tpl = get_markup_template('opensearch.tpl');
        
                header("Content-type: application/opensearchdescription+xml");
        

diff --git a/mod/photos.php b/mod/photos.php
index 70bb5ff3de0f4fa7bf9221887d7f3ce0510847f2..a2efda43853f29414e91b4196565ac721fd02656 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -828,7 +828,7 @@ function photos_content(&$a) {
 
  
 
-               $tpl = file_get_contents('view/photos_upload.tpl');
+               $tpl = get_markup_template('photos_upload.tpl');
                $o .= replace_macros($tpl,array(
                        '$pagename' => t('Upload Photos'),
                        '$sessid' => session_id(),
@@ -874,7 +874,7 @@ function photos_content(&$a) {
                if($cmd === 'edit') {           
                        if(($album != t('Profile Photos')) && ($album != t('Contact Photos'))) {
                                if($can_post) {
-                                       $edit_tpl = file_get_contents('view/album_edit.tpl');
+                                       $edit_tpl = get_markup_template('album_edit.tpl');
                                        $o .= replace_macros($edit_tpl,array(
                                                '$nametext' => t('New album name: '),
                                                '$nickname' => $a->data['user']['nickname'],
@@ -895,7 +895,7 @@ function photos_content(&$a) {
                                }
                        }
                }
-               $tpl = file_get_contents('view/photo_album.tpl');
+               $tpl = get_markup_template('photo_album.tpl');
                if(count($r))
                        foreach($r as $rr) {
                                $o .= replace_macros($tpl,array(
@@ -1073,7 +1073,7 @@ function photos_content(&$a) {
 
                $edit = Null;
                if(($cmd === 'edit') && ($can_post)) {
-                       $edit_tpl = file_get_contents('view/photo_edit.tpl');
+                       $edit_tpl = get_markup_template('photo_edit.tpl');
                        $edit = replace_macros($edit_tpl, array(
                                '$id' => $ph[0]['id'],
                                '$album' => $ph[0]['album'],
@@ -1095,11 +1095,11 @@ function photos_content(&$a) {
 
                if(count($linked_items)) {
 
-                       $cmnt_tpl = file_get_contents('view/comment_item.tpl');
-                       $tpl = file_get_contents('view/photo_item.tpl');
+                       $cmnt_tpl = get_markup_template('comment_item.tpl');
+                       $tpl = get_markup_template('photo_item.tpl');
                        $return_url = $a->cmd;
 
-                       $like_tpl = file_get_contents('view/like_noshare.tpl');
+                       $like_tpl = get_markup_template('like_noshare.tpl');
 
                        $likebuttons = '';
 
@@ -1225,7 +1225,7 @@ function photos_content(&$a) {
                                        $drop = '';
 
                                        if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
-                                               $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')));
 
 
                                        $comments .= replace_macros($template,array(
@@ -1247,7 +1247,7 @@ function photos_content(&$a) {
                        $paginate = paginate($a);
                }
                
-               $photo_tpl = load_view_file('view/photo_view.tpl');
+               $photo_tpl = get_markup_template('photo_view.tpl');
                $o .= replace_macros($photo_tpl, array(
                        '$id' => $ph[0]['id'],
                        '$album' => array($album_link,$ph[0]['album']),
@@ -1298,7 +1298,7 @@ function photos_content(&$a) {
                        . $a->data['user']['nickname'] . '/upload' . '">' . t('Upload New Photos') . '</a></div>';
        }
 
-       $tpl = file_get_contents('view/photo_top.tpl');
+       $tpl = get_markup_template('photo_top.tpl');
        if(count($r)) {
                foreach($r as $rr) {
                        $o .= replace_macros($tpl,array(

diff --git a/mod/profile.php b/mod/profile.php
index 2af6f2429bb1033fa5694cf5f0ce8a18ca64c8a6..340c96d860d2fddc9c40ff05ee6e6eeabf556015 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 = load_view_file('view/profile_tabs.tpl');
+               $tpl = get_markup_template('profile_tabs.tpl');
 
                $o .= replace_macros($tpl,array(
                        '$url' => $a->get_baseurl() . '/' . $a->cmd,

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index f77cbfecda829a7493371a1d6ae3f6800da78f84..b1fd0fc6ef41cc059ad67c8906fb410f94fab755 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -186,7 +186,7 @@ function profile_photo_content(&$a) {
 
        if(! x($a->config,'imagecrop')) {
        
-               $tpl = file_get_contents('view/profile_photo.tpl');
+               $tpl = get_markup_template('profile_photo.tpl');
 
                $o .= replace_macros($tpl,array(
                        '$user' => $a->user['nickname'],
@@ -201,7 +201,7 @@ function profile_photo_content(&$a) {
        else {
                $filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.jpg';
                $resolution = $a->config['imagecrop_resolution'];
-               $tpl = file_get_contents("view/cropbody.tpl");
+               $tpl = get_markup_template("cropbody.tpl");
                $o .= replace_macros($tpl,array(
                        '$filename' => $filename,
                        '$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
@@ -252,7 +252,7 @@ function profile_photo_crop_ui_head(&$a, $ph){
 
        $a->config['imagecrop'] = $hash;
        $a->config['imagecrop_resolution'] = $smallest;
-       $a->page['htmlhead'] .= file_get_contents("view/crophead.tpl");
+       $a->page['htmlhead'] .= get_markup_template("crophead.tpl");
        return;
 }}
 

diff --git a/mod/profiles.php b/mod/profiles.php
index 32ee130342d2aeca11f4817c0d90cfaaa4d1d0a0..984420aa2c7acc2ac032adc6c5b38a227a1daae7 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -347,9 +347,9 @@ function profiles_content(&$a) {
 
                require_once('include/profile_selectors.php');
 
-               $tpl = file_get_contents('view/profed_head.tpl');
+               $tpl = get_markup_template('profed_head.tpl');
 
-               $opt_tpl = file_get_contents("view/profile-hide-friends.tpl");
+               $opt_tpl = get_markup_template("profile-hide-friends.tpl");
                $hide_friends = replace_macros($opt_tpl,array(
                        '$desc' => t('Hide my contact/friend list from viewers of this profile?'),
                        '$yes_str' => t('Yes'),
@@ -364,7 +364,7 @@ function profiles_content(&$a) {
 
 
                $is_default = (($r[0]['is-default']) ? 1 : 0);
-               $tpl = file_get_contents("view/profile_edit.tpl");
+               $tpl = get_markup_template("profile_edit.tpl");
                $o .= replace_macros($tpl,array(
                        '$banner' => t('Edit Profile Details'),
                        '$submit' => t('Submit'),
@@ -451,7 +451,7 @@ function profiles_content(&$a) {
                        local_user());
                if(count($r)) {
 
-                       $tpl_header = file_get_contents('view/profile_listing_header.tpl');
+                       $tpl_header = get_markup_template('profile_listing_header.tpl');
                        $o .= replace_macros($tpl_header,array(
                                '$header' => t('Profiles'),
                                '$chg_photo' => t('Change profile photo'),
@@ -459,7 +459,7 @@ function profiles_content(&$a) {
                        ));
 
 
-                       $tpl = file_get_contents('view/profile_entry.tpl');
+                       $tpl = get_markup_template('profile_entry.tpl');
 
                        foreach($r as $rr) {
                                $o .= replace_macros($tpl, array(

diff --git a/mod/register.php b/mod/register.php
index da629a21436e9f036176293aa32af46600098f3e..c9521f9be5dd3826d873322927cf8e4813383784 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -319,7 +319,7 @@ function register_post(&$a) {
 
 
        if( $a->config['register_policy'] == REGISTER_OPEN ) {
-               $email_tpl = load_view_file("view/register_open_eml.tpl");
+               $email_tpl = get_intltext_template("register_open_eml.tpl");
                $email_tpl = replace_macros($email_tpl, array(
                                '$sitename' => $a->config['sitename'],
                                '$siteurl' =>  $a->get_baseurl(),
@@ -357,7 +357,7 @@ function register_post(&$a) {
                        dbesc($new_password)
                );
 
-               $email_tpl = load_view_file("view/register_verify_eml.tpl");
+               $email_tpl = get_intltext_template("register_verify_eml.tpl");
                $email_tpl = replace_macros($email_tpl, array(
                                '$sitename' => $a->config['sitename'],
                                '$siteurl' =>  $a->get_baseurl(),
@@ -435,7 +435,7 @@ function register_content(&$a) {
                $profile_publish_reg = '<input type="hidden" name="profile_publish_reg" value="1" />';
        }
        else {
-               $publish_tpl = file_get_contents("view/profile_publish.tpl");
+               $publish_tpl = get_markup_template("profile_publish.tpl");
                $profile_publish = replace_macros($publish_tpl,array(
                        '$instance'     => 'reg',
                        '$pubdesc'      => t('Include your profile in member directory?'),
@@ -450,7 +450,7 @@ function register_content(&$a) {
        $license = t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.');
 
 
-       $o = file_get_contents("view/register.tpl");
+       $o = get_markup_template("register.tpl");
        $o = replace_macros($o, array(
                '$oidhtml' => $oidhtml,
                '$realpeople' => $realpeople,

diff --git a/mod/regmod.php b/mod/regmod.php
index b985ee3644e69600d960a98cfe8f73be19109c88..fe29cb185f66e75fc885e4a3fef301b1a5373060 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -79,7 +79,7 @@ function regmod_content(&$a) {
                                proc_run('php',"include/directory.php","$url");
                }
 
-               $email_tpl = load_view_file("view/register_open_eml.tpl");
+               $email_tpl = get_intltext_template("register_open_eml.tpl");
                $email_tpl = replace_macros($email_tpl, array(
                                '$sitename' => $a->config['sitename'],
                                '$siteurl' =>  $a->get_baseurl(),

diff --git a/mod/removeme.php b/mod/removeme.php
index 89b08cdc52c7a4050833b5e9999c0f81bb353f01..6a56963b6c8a8426ca75613b89ab46f976682250 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -35,7 +35,7 @@ function removeme_content(&$a) {
 
        $_SESSION['remove_account_verify'] = $hash;
 
-       $tpl = file_get_contents('view/removeme.tpl');
+       $tpl = get_markup_template('removeme.tpl');
        $o .= replace_macros($tpl, array(
                '$basedir' => $a->get_baseurl(),
                '$hash' => $hash,

diff --git a/mod/salmon.php b/mod/salmon.php
index e93703001cb5f28c302c2a3d81ed389fcdb4d551..c2f76aa0a641889f583aa0b93e38b5c22f22b739 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -89,7 +89,7 @@ function salmon_post(&$a) {
 
        // Create a fake feed wrapper so simplepie doesn't choke
 
-       $tpl = file_get_contents('view/fake_feed.tpl');
+       $tpl = get_markup_template('fake_feed.tpl');
        
        $base = substr($data,strpos($data,'<entry'));
 

diff --git a/mod/settings.php b/mod/settings.php
index 99fe852eeb5331e07f5f0ae32c7783e72fd3d385..cba6958b3c47b8dd05920dc696ec9edca0d2eaa5 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -310,7 +310,7 @@ function settings_content(&$a) {
        $mail_pubmail = ((count($r)) ? $r[0]['pubmail'] : 0);
 
 
-       $pageset_tpl = file_get_contents('view/pagetypes.tpl');
+       $pageset_tpl = get_markup_template('pagetypes.tpl');
        $pagetype = replace_macros($pageset_tpl,array(
                '$normal'         => (($a->user['page-flags'] == PAGE_NORMAL)      ? " checked=\"checked\" " : ""),
                '$soapbox'        => (($a->user['page-flags'] == PAGE_SOAPBOX)     ? " checked=\"checked\" " : ""),
@@ -344,7 +344,7 @@ function settings_content(&$a) {
                $profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
        }
        else {
-               $opt_tpl = file_get_contents("view/profile-in-directory.tpl");
+               $opt_tpl = get_markup_template("profile-in-directory.tpl");
                $profile_in_dir = replace_macros($opt_tpl,array(
                        '$desc'         => t('Publish your default profile in site directory?'),
                        '$yes_str'      => t('Yes'),
@@ -355,7 +355,7 @@ function settings_content(&$a) {
        }
 
        if(strlen(get_config('system','directory_submit_url'))) {
-               $opt_tpl = file_get_contents("view/profile-in-netdir.tpl");
+               $opt_tpl = get_markup_template("profile-in-netdir.tpl");
 
                $profile_in_net_dir = replace_macros($opt_tpl,array(
                        '$desc'         => t('Publish your default profile in global social directory?'),
@@ -397,7 +397,7 @@ function settings_content(&$a) {
 
        $subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : '');
 
-       $tpl_addr = file_get_contents("view/settings_nick_set.tpl");
+       $tpl_addr = get_markup_template("settings_nick_set.tpl");
 
        $prof_addr = replace_macros($tpl_addr,array(
                '$desc' => t('Your Identity Address is'),
@@ -406,7 +406,7 @@ function settings_content(&$a) {
                '$basepath' => $a->get_hostname()
        ));
 
-       $stpl = load_view_file('view/settings.tpl');
+       $stpl = get_markup_template('settings.tpl');
 
        $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 996f7e476e3518c4433292466e4acea209b02303..732607b182aaf98517dc52fb7e5042345f141f57 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -41,7 +41,7 @@ function viewcontacts_content(&$a) {
                return $o;
        }
 
-       $tpl = file_get_contents("view/viewcontact_template.tpl");
+       $tpl = get_markup_template("viewcontact_template.tpl");
 
        foreach($r as $rr) {
                if($rr['self'])

diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl
index 85f73064ec42618d7bad9bb783b4f9e7ed2715d0..9914f647591f8354f690631dfed5ed00d8a8a124 100644 (file)
--- a/view/api_timeline_xml.tpl
+++ b/view/api_timeline_xml.tpl
@@ -15,7 +15,7 @@
     <coordinates>$status.coordinates</coordinates>
     <place>$status.place</place>
     <contributors>$status.contributors</contributors>
-       {{ inc view/api_user_xml.tpl with $user=$status.user }}{{ endinc }}
+       {{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}
   </status>
   {{ endfor }}
 </statuses>
\ No newline at end of file