keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of git://github.com/friendika/friendika

Browse source
This commit is contained in:
Tobias Diekershoff 2011-01-23 08:43:30 +01:00
commit 60c5e76b2d
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/bbcode.php
View file

@ -21,7 +21,8 @@ function bbcode($Text) {
// Perform URL Search // Perform URL Search
$Text = preg_replace("/[^\]\=](https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' <a href="$1" >$1</a>', $Text);
$Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' <a href="$2" >$2</a>', $Text);
$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" >$1</a>', $Text); $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" >$1</a>', $Text);
$Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" >$2</a>', $Text); $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" >$2</a>', $Text);

2
mod/dfrn_request.php
View file

@ -590,7 +590,7 @@ function dfrn_request_content(&$a) {
$myaddr = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3 ); $myaddr = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3 );
} }
} }
elseif($x($_GET,'addr')) { elseif(x($_GET,'addr')) {
$myaddr = hex2bin($_GET['addr']); $myaddr = hex2bin($_GET['addr']);
} }
else { else {

2
mod/like.php
View file

@ -149,7 +149,7 @@ EOT;
$arr['author-name'] = $contact['name']; $arr['author-name'] = $contact['name'];
$arr['author-link'] = $contact['url']; $arr['author-link'] = $contact['url'];
$arr['author-avatar'] = $contact['thumb']; $arr['author-avatar'] = $contact['thumb'];
$arr['body'] = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . ' ' . t('likes') . ' ' $arr['body'] = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . ' ' . $bodyverb . ' '
. '[url=' . $item['author-link'] . ']' . $item['author-name'] . t('\'s') . '[/url]' . ' ' . '[url=' . $item['author-link'] . ']' . $item['author-name'] . t('\'s') . '[/url]' . ' '
. '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]' ; . '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]' ;

4
view/en/profile_advanced.php
View file

@ -39,8 +39,8 @@ EOT;
$o .= '<div id="advanced-profile-dob">' $o .= '<div id="advanced-profile-dob">'
. ((intval($a->profile['dob'])) . ((intval($a->profile['dob']))
? day_translate(datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'j F, Y')) ? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00','j F, Y'))
: day_translate(datetime_convert('UTC',date_default_timezone_get(),'2001-' . substr($a->profile['dob'],6),'j F'))) : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','j F')))
. "</div>\r\n</div>"; . "</div>\r\n</div>";
$o .= '<div id="advanced-profile-dob-end"></div>'; $o .= '<div id="advanced-profile-dob-end"></div>';

4
view/it/profile_advanced.php
View file

@ -39,8 +39,8 @@ EOT;
$o .= '<div id="advanced-profile-dob">' $o .= '<div id="advanced-profile-dob">'
. ((intval($a->profile['dob'])) . ((intval($a->profile['dob']))
? day_translate(datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'j F, Y')) ? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00','j F, Y'))
: day_translate(datetime_convert('UTC',date_default_timezone_get(),'2001-' . substr($a->profile['dob'],6),'j F'))) : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','j F')))
. "</div>\r\n</div>"; . "</div>\r\n</div>";
$o .= '<div id="advanced-profile-dob-end"></div>'; $o .= '<div id="advanced-profile-dob-end"></div>';