wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber 2011-02-28 10:18:18 -08:00
commit 2bd9532ebe
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Notice.php
View File

@ -1072,6 +1072,7 @@ class Notice extends Memcached_DataObject
$reply->notice_id = $this->id; $reply->notice_id = $this->id;
$reply->profile_id = $profile->id; $reply->profile_id = $profile->id;
$reply->modified = $this->created;
common_log(LOG_INFO, __METHOD__ . ": saving reply: notice $this->id to profile $profile->id"); common_log(LOG_INFO, __METHOD__ . ": saving reply: notice $this->id to profile $profile->id");
@ -1132,6 +1133,7 @@ class Notice extends Memcached_DataObject
$reply->notice_id = $this->id; $reply->notice_id = $this->id;
$reply->profile_id = $mentioned->id; $reply->profile_id = $mentioned->id;
$reply->modified = $this->created;
$id = $reply->insert(); $id = $reply->insert();

3
classes/statusnet.ini
View File

@ -502,7 +502,8 @@ uri = U
[reply] [reply]
notice_id = 129 notice_id = 129
profile_id = 129 profile_id = 129
modified = 384 modified = 142
;modified = 384 ; skipping the mysql_timestamp mode so we can override its setting
replied_id = 1 replied_id = 1
[reply__keys] [reply__keys]

10
lib/util.php
View File

@ -925,11 +925,11 @@ function common_linkify($url) {
// functions // functions
$url = htmlspecialchars_decode($url); $url = htmlspecialchars_decode($url);
if(strpos($url, '@') !== false && strpos($url, ':') === false) { if (strpos($url, '@') !== false && strpos($url, ':') === false && Validate::email($url)) {
//url is an email address without the mailto: protocol //url is an email address without the mailto: protocol
$canon = "mailto:$url"; $canon = "mailto:$url";
$longurl = "mailto:$url"; $longurl = "mailto:$url";
}else{ } else {
$canon = File_redirection::_canonUrl($url); $canon = File_redirection::_canonUrl($url);

1
plugins/TwitterBridge/twitterimport.php
View File

@ -675,6 +675,7 @@ class TwitterImport
$reply = new Reply(); $reply = new Reply();
$reply->notice_id = $notice->id; $reply->notice_id = $notice->id;
$reply->profile_id = $user->id; $reply->profile_id = $user->id;
$reply->modified = $notice->created;
common_log(LOG_INFO, __METHOD__ . ": saving reply: notice {$notice->id} to profile {$user->id}"); common_log(LOG_INFO, __METHOD__ . ": saving reply: notice {$notice->id} to profile {$user->id}");
$id = $reply->insert(); $id = $reply->insert();
} }

10
tests/URLDetectionTest.php
View File

@ -20,6 +20,8 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
public function testProduction($content, $expected) public function testProduction($content, $expected)
{ {
$rendered = common_render_text($content); $rendered = common_render_text($content);
// hack!
$rendered = preg_replace('/id="attachment-\d+"/', 'id="attachment-XXX"', $rendered);
$this->assertEquals($expected, $rendered); $this->assertEquals($expected, $rendered);
} }
@ -269,7 +271,13 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
array('file.html', array('file.html',
'file.html'), 'file.html'),
array('file.php', array('file.php',
'file.php') 'file.php'),
// scheme-less HTTP URLs with @ in the path: http://status.net/open-source/issues/2248
array('http://flickr.com/photos/34807140@N05/3838905434',
'<a href="http://flickr.com/photos/34807140@N05/3838905434" title="http://flickr.com/photos/34807140@N05/3838905434" class="attachment thumbnail" id="attachment-XXX" rel="nofollow external">http://flickr.com/photos/34807140@N05/3838905434</a>'),
array('flickr.com/photos/34807140@N05/3838905434',
'<a href="http://flickr.com/photos/34807140@N05/3838905434" title="http://flickr.com/photos/34807140@N05/3838905434" class="attachment thumbnail" id="attachment-XXX" rel="nofollow external">flickr.com/photos/34807140@N05/3838905434</a>'),
); );
} }
} }