bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

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.

Browse source
This commit is contained in:
Friendika 2011-05-10 16:12:50 -07:00
commit c052d68828
32 changed files with 86 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/api.php
View file

@ -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":

22
include/conversation.php
View file

@ -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 = '';

2
include/items.php
View file

@ -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 = '';

2
include/nav.php
View file

@ -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(),

4
include/notifier.php
View file

@ -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();

2
include/salmon.php
View file

@ -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,