mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Removed some test code

Browse source
This commit is contained in:
Michael Vogel 2016-01-15 23:32:13 +01:00
parent 90a8d6f0f5
commit 092c2e5433
3 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
boot.php
View file

@ -1042,9 +1042,6 @@ class App {
$function = implode(", ", $function); $function = implode(", ", $function);
//$last = array_pop($trace);
//$function = $last["function"];
$this->callstack[$value][$function] += (float)$duration; $this->callstack[$value][$function] += (float)$duration;
} }

10
include/conversation.php
View file

@ -315,11 +315,11 @@ function localize_item(&$item){
} }
// add zrl's to public images // add zrl's to public images
// $photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is"; $photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is";
// if(preg_match($photo_pattern,$item['body'])) { if(preg_match($photo_pattern,$item['body'])) {
// $photo_replace = '[url=' . zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5' . '[/img][/url]'; $photo_replace = '[url=' . zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5' . '[/img][/url]';
// $item['body'] = bb_tag_preg_replace($photo_pattern, $photo_replace, 'url', $item['body']); $item['body'] = bb_tag_preg_replace($photo_pattern, $photo_replace, 'url', $item['body']);
// } }
// add sparkle links to appropriate permalinks // add sparkle links to appropriate permalinks

5
include/text.php
View file

@ -1415,8 +1415,6 @@ function prepare_body(&$item,$attach = false, $preview = false) {
$item['hashtags'] = $hashtags; $item['hashtags'] = $hashtags;
$item['mentions'] = $mentions; $item['mentions'] = $mentions;
$test = $item["rendered-html"];
// Update the cached values if there is no "zrl=..." on the links // Update the cached values if there is no "zrl=..." on the links
$update = (!local_user() and !remote_user() and ($item["uid"] == 0)); $update = (!local_user() and !remote_user() and ($item["uid"] == 0));
@ -1427,9 +1425,6 @@ function prepare_body(&$item,$attach = false, $preview = false) {
put_item_in_cache($item, $update); put_item_in_cache($item, $update);
$s = $item["rendered-html"]; $s = $item["rendered-html"];
//if ($test != $s)
// $s .= "<hr>*********************************<hr>".$test;
$prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview); $prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview);
call_hooks('prepare_body', $prep_arr); call_hooks('prepare_body', $prep_arr);
$s = $prep_arr['html']; $s = $prep_arr['html'];