GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robin Millette 2009-06-17 16:21:50 -04:00
parent befbfc9c73
commit 1505e3a4c3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/File.php
View File

@ -79,7 +79,6 @@ class File extends Memcached_DataObject
&& ('text/html' === substr($redir_data['type'], 0, 9)) && ('text/html' === substr($redir_data['type'], 0, 9))
&& ($oembed_data = File_oembed::_getOembed($given_url)) && ($oembed_data = File_oembed::_getOembed($given_url))
&& isset($oembed_data['json'])) { && isset($oembed_data['json'])) {
File_oembed::saveNew($oembed_data['json'], $file_id); File_oembed::saveNew($oembed_data['json'], $file_id);
} }
return $x; return $x;
@ -98,7 +97,6 @@ class File extends Memcached_DataObject
if ($redir_url === $given_url) { if ($redir_url === $given_url) {
$x = File::saveNew($redir_data, $given_url); $x = File::saveNew($redir_data, $given_url);
$file_id = $x->id; $file_id = $x->id;
} else { } else {
$x = File::processNew($redir_url, $notice_id); $x = File::processNew($redir_url, $notice_id);
$file_id = $x->id; $file_id = $x->id;

8
classes/Notice.php
View File

@ -218,6 +218,12 @@ class Notice extends Memcached_DataObject
$notice->addToInboxes(); $notice->addToInboxes();
$notice->saveGroups(); $notice->saveGroups();
$notice->saveUrls(); $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'); $notice->query('COMMIT');
@ -237,8 +243,6 @@ class Notice extends Memcached_DataObject
* follow redirects and save all available file information * follow redirects and save all available file information
* (mimetype, date, size, oembed, etc.) * (mimetype, date, size, oembed, etc.)
* *
* @param class $notice Notice to pull URLs from
*
* @return void * @return void
*/ */
function saveUrls() { function saveUrls() {