Removed some test code

diff --git a/boot.php b/boot.php
index 1b1c6a84d620b785bb0ce3066cc55a609d1a3a54..4f0bec62b19a7d442052e2b70ac4239fe425d625 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1042,9 +1042,6 @@ class App {
 
                $function = implode(", ", $function);
 
-               //$last = array_pop($trace);
-               //$function = $last["function"];
-
                $this->callstack[$value][$function] += (float)$duration;
 
        }

diff --git a/include/conversation.php b/include/conversation.php
index 5268c9e29c3bfa35572624b1b30835d9b23b34d3..6c33be84fb33971d1f9a167e7607e244487268c0 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -315,11 +315,11 @@ function localize_item(&$item){
        }
 
        // add zrl's to public images
-//     $photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is";
-//     if(preg_match($photo_pattern,$item['body'])) {
-//             $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']);
-//     }
+       $photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is";
+       if(preg_match($photo_pattern,$item['body'])) {
+               $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']);
+       }
 
        // add sparkle links to appropriate permalinks
 

diff --git a/include/text.php b/include/text.php
index 7e0aec97e29a2c2eb21546cac8e1ceeb4ed4583e..200e2c9bcad260053a9741cf3d722224a2bd7ddd 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -1415,8 +1415,6 @@ function prepare_body(&$item,$attach = false, $preview = false) {
        $item['hashtags'] = $hashtags;
        $item['mentions'] = $mentions;
 
-       $test = $item["rendered-html"];
-
        // Update the cached values if there is no "zrl=..." on the links
        $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);
        $s = $item["rendered-html"];
 
-       //if ($test != $s)
-       //      $s .= "<hr>*********************************<hr>".$test;
-
        $prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview);
        call_hooks('prepare_body', $prep_arr);
        $s = $prep_arr['html'];