From a80ab1948354be591d246367b0e2ab87d8bec46e Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 22 Jan 2011 02:51:31 -0800 Subject: [PATCH 1/5] typo --- mod/dfrn_request.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 742d25142..24c466bba 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -590,7 +590,7 @@ function dfrn_request_content(&$a) { $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']); } else { From 844b177791d8fa75fc9e5f4ec279557f0d0e4a46 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 22 Jan 2011 03:21:15 -0800 Subject: [PATCH 2/5] birthday timezone is absolute --- view/en/profile_advanced.php | 4 ++-- view/it/profile_advanced.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/view/en/profile_advanced.php b/view/en/profile_advanced.php index 9aee6c262..d2b9d0612 100644 --- a/view/en/profile_advanced.php +++ b/view/en/profile_advanced.php @@ -39,8 +39,8 @@ EOT; $o .= '
' . ((intval($a->profile['dob'])) - ? day_translate(datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'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',$a->profile['dob'] . ' 00:00 +00:00','j F, Y')) + : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','j F'))) . "
\r\n"; $o .= '
'; diff --git a/view/it/profile_advanced.php b/view/it/profile_advanced.php index 899fd56b2..44327f6a6 100644 --- a/view/it/profile_advanced.php +++ b/view/it/profile_advanced.php @@ -39,8 +39,8 @@ EOT; $o .= '
' . ((intval($a->profile['dob'])) - ? day_translate(datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'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',$a->profile['dob'] . ' 00:00 +00:00','j F, Y')) + : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','j F'))) . "
\r\n"; $o .= '
'; From f278d17910553a5b51b163da7341c6bb22bfdc7b Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 22 Jan 2011 03:59:13 -0800 Subject: [PATCH 3/5] wrong verb in dislike activity body --- mod/like.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/like.php b/mod/like.php index f256cd9a1..7b2097578 100644 --- a/mod/like.php +++ b/mod/like.php @@ -149,7 +149,7 @@ EOT; $arr['author-name'] = $contact['name']; $arr['author-link'] = $contact['url']; $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=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]' ; From 6c0218563f9d1b88a2adbaaa875558d4c3abea0b Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 22 Jan 2011 05:19:53 -0800 Subject: [PATCH 4/5] linkify naked urls when they are at the beginning of the text --- include/bbcode.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/bbcode.php b/include/bbcode.php index ef31f5a66..81b581cdb 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -21,7 +21,8 @@ function bbcode($Text) { // Perform URL Search - $Text = preg_replace("/[^\]\=](https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' $1', $Text); + + $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' $2', $Text); $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '$1', $Text); $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '$2', $Text); From 43dc0b4280b00cb66a1ca97341dfe7e795f5988c Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 23 Jan 2011 08:45:30 +0100 Subject: [PATCH 5/5] updated profile_advanced.php from changes in view/en --- view/de/profile_advanced.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/de/profile_advanced.php b/view/de/profile_advanced.php index 9aee6c262..d2b9d0612 100644 --- a/view/de/profile_advanced.php +++ b/view/de/profile_advanced.php @@ -39,8 +39,8 @@ EOT; $o .= '
' . ((intval($a->profile['dob'])) - ? day_translate(datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'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',$a->profile['dob'] . ' 00:00 +00:00','j F, Y')) + : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','j F'))) . "
\r\n"; $o .= '
';