From: Robin Millette <millette@controlyourself.ca>
Date: Wed, 17 Jun 2009 20:21:50 +0000 (-0400)
Subject: Fixed recent attachment bug that required URLs to be posted twice to be taken into... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1505e3a4c3dda7030bb92a2071ec58af2972bed7;p=quix0rs-gnu-social.git

Fixed recent attachment bug that required URLs to be posted twice to be taken into account.
---

diff --git a/classes/File.php b/classes/File.php
index 24ab11b8eb..08320faf8f 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -79,7 +79,6 @@ class File extends Memcached_DataObject
             && ('text/html' === substr($redir_data['type'], 0, 9))
             && ($oembed_data = File_oembed::_getOembed($given_url))
             && isset($oembed_data['json'])) {
-
             File_oembed::saveNew($oembed_data['json'], $file_id);
         }
         return $x;
@@ -98,7 +97,6 @@ class File extends Memcached_DataObject
                 if ($redir_url === $given_url) {
                     $x = File::saveNew($redir_data, $given_url);
                     $file_id = $x->id;
-
                 } else {
                     $x = File::processNew($redir_url, $notice_id);
                     $file_id = $x->id;
diff --git a/classes/Notice.php b/classes/Notice.php
index 770b5d78b7..e0bb90ba62 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -218,6 +218,12 @@ class Notice extends Memcached_DataObject
             $notice->addToInboxes();
             $notice->saveGroups();
             $notice->saveUrls();
+            $orig2 = clone($notice);
+    		$notice->rendered = common_render_content($final, $notice);
+            if (!$notice->update($orig2)) {
+                common_log_db_error($notice, 'UPDATE', __FILE__);
+                return _('Problem saving notice.');
+            }
 
             $notice->query('COMMIT');
 
@@ -237,8 +243,6 @@ class Notice extends Memcached_DataObject
      * follow redirects and save all available file information
      * (mimetype, date, size, oembed, etc.)
      *
-     * @param class $notice Notice to pull URLs from
-     *
      * @return void
      */
     function saveUrls() {