Relocated the cache code.

diff --git a/include/items.php b/include/items.php
index 8bb981b6de5fb911d777355b6ce5bbab044b5534..93bc4cc97995c84840d3a2f53f89f0160c6384ea 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -1480,16 +1480,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
        if (!$deleted AND !$dontcache) {
 
                // Store the fresh generated item into the cache
-               $cachefile = get_cachefile(urlencode($arr["guid"])."-".hash("md5", $arr['body']));
-
-               if (($cachefile != '') AND !file_exists($cachefile)) {
-                       $s = prepare_text($arr['body']);
-                       $a = get_app();
-                       $stamp1 = microtime(true);
-                       file_put_contents($cachefile, $s);
-                       $a->save_timestamp($stamp1, "file");
-                       logger('item_store: put item '.$current_post.' into cachefile '.$cachefile);
-               }
+               put_item_in_cache($arr);
 
                $r = q('SELECT * FROM `item` WHERE id = %d', intval($current_post));
                if (count($r) == 1) {

diff --git a/include/text.php b/include/text.php
index 43b321e98a01f503ce960e8ae91e32b0eb3310c3..a9edbf7611620e9863be14afd5b7771fbbbfbf1e 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -1281,6 +1281,18 @@ function redir_private_images($a, &$item) {
 
 }}
 
+function put_item_in_cache($item) {
+       $cachefile = get_cachefile(urlencode($item["guid"])."-".hash("md5", $item['body']));
+
+       if (($cachefile != '') AND !file_exists($cachefile)) {
+               $s = prepare_text($item['body']);
+               $a = get_app();
+               $stamp1 = microtime(true);
+               file_put_contents($cachefile, $s);
+               $a->save_timestamp($stamp1, "file");
+               logger('put item '.$item["guid"].' into cachefile '.$cachefile);
+       }
+}
 
 // Given an item array, convert the body element from bbcode to html and add smilie icons.
 // If attach is true, also add icons for item attachments

diff --git a/mod/item.php b/mod/item.php
index a66535d7ded21bb0061690f92d573a6dd9234375..a3a8dd938e88ed1ece2315d7003ab3bdf3e9c223 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -22,6 +22,7 @@ require_once('library/langdet/Text/LanguageDetect.php');
 require_once('include/tags.php');
 require_once('include/files.php');
 require_once('include/threads.php');
+require_once('include/text.php');
 
 function item_post(&$a) {
 
@@ -824,21 +825,12 @@ function item_post(&$a) {
        if(count($r)) {
                $post_id = $r[0]['id'];
                logger('mod_item: saved item ' . $post_id);
-               add_thread($post_id);
 
                // update filetags in pconfig
                file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
 
                // Store the fresh generated item into the cache
-               $cachefile = get_cachefile(urlencode($datarray["guid"])."-".hash("md5", $datarray['body']));
-
-               if (($cachefile != '') AND !file_exists($cachefile)) {
-                       $s = prepare_text($datarray['body']);
-                       $stamp1 = microtime(true);
-                       file_put_contents($cachefile, $s);
-                       $a->save_timestamp($stamp1, "file");
-                       logger('mod_item: put item '.$r[0]['id'].' into cachefile '.$cachefile);
-               }
+               put_item_in_cache($datarray);
 
                if($parent) {
 
@@ -947,7 +939,8 @@ function item_post(&$a) {
                dbesc(datetime_convert()),
                intval($parent)
        );
-       update_thread($parent);
+       if ($post_id != $parent)
+               update_thread($parent);
 
        $datarray['id']    = $post_id;
        $datarray['plink'] = $a->get_baseurl().'/display/'.urlencode($datarray['guid']);
@@ -990,7 +983,9 @@ function item_post(&$a) {
 
        create_tags_from_item($post_id);
        create_files_from_item($post_id);
-       update_thread($post_id);
+
+       if ($post_id == $parent)
+               add_thread($post_id);
 
        // This is a real juggling act on shared hosting services which kill your processes
        // e.g. dreamhost. We used to start delivery to our native delivery agents in the background