aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-05-10 16:12:50 -0700
committerFriendika <info@friendika.com>2011-05-10 16:12:50 -0700
commitc052d688284fda76c612325b237d8352f2abb5d4 (patch)
tree7867f7a67b96f715644c2f4b9d1bc84a7371ebfc /include
parent3ae36584110af2acd4a0f4805dd078da30732a1d (diff)
downloadvolse-hubzilla-c052d688284fda76c612325b237d8352f2abb5d4.tar.gz
volse-hubzilla-c052d688284fda76c612325b237d8352f2abb5d4.tar.bz2
volse-hubzilla-c052d688284fda76c612325b237d8352f2abb5d4.zip
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.
Diffstat (limited to 'include')
-rw-r--r--include/api.php2
-rw-r--r--include/conversation.php22
-rw-r--r--include/items.php2
-rw-r--r--include/nav.php2
-rw-r--r--include/notifier.php4
-rw-r--r--include/salmon.php2
6 files changed, 17 insertions, 17 deletions
diff --git a/include/api.php b/include/api.php
index 82790a638..0753962ab 100644
--- a/include/api.php
+++ b/include/api.php
@@ -273,7 +273,7 @@
case "atom":
case "xml":
$data = api_xmlify($data);
- $tpl = load_view_file("view/api_".$templatename."_".$type.".tpl");
+ $tpl = file_get_contents("view/api_".$templatename."_".$type.".tpl");
$ret = replace_macros($tpl, $data);
break;
case "json":
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) {
? '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id']
. '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>'
: '');
- $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 = '';
diff --git a/include/items.php b/include/items.php
index b7863f838..c75e509cf 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 = load_view_file('view/atom_feed.tpl');
+ $feed_template = file_get_contents('view/atom_feed.tpl');
$atom = '';
diff --git a/include/nav.php b/include/nav.php
index 2ead5c07e..602385c32 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 = file_get_contents('view/nav.tpl');
$a->page['nav'] .= replace_macros($tpl, array(
'$langselector' => lang_selector(),
diff --git a/include/notifier.php b/include/notifier.php
index b009cc870..bd061a0c6 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -191,8 +191,8 @@ function notifier_run($argv, $argc){
$contacts = $r;
}
- $feed_template = load_view_file('view/atom_feed.tpl');
- $mail_template = load_view_file('view/atom_mail.tpl');
+ $feed_template = file_get_contents('view/atom_feed.tpl');
+ $mail_template = file_get_contents('view/atom_mail.tpl');
$atom = '';
$slaps = array();
diff --git a/include/salmon.php b/include/salmon.php
index b5c21a87b..b96ca774f 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -161,7 +161,7 @@ EOT;
$signature2 = base64url_encode($rsa->sign($data));
- $salmon_tpl = load_view_file('view/magicsig.tpl');
+ $salmon_tpl = file_get_contents('view/magicsig.tpl');
$salmon = replace_macros($salmon_tpl,array(
'$data' => $data,
'$encoding' => $encoding,