aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@diekershoff.homeunix.net>2011-01-23 08:46:57 +0100
committerroot <root@diekershoff.homeunix.net>2011-01-23 08:46:57 +0100
commit71294faf2c182a678e5889b2ff9cabed16d83c82 (patch)
treed6ad7955921285a374b5dd666153d42a6071e871
parent0dc7e0975a7cd02d8c79dda42c836c31d84c9e24 (diff)
parent43dc0b4280b00cb66a1ca97341dfe7e795f5988c (diff)
downloadvolse-hubzilla-71294faf2c182a678e5889b2ff9cabed16d83c82.tar.gz
volse-hubzilla-71294faf2c182a678e5889b2ff9cabed16d83c82.tar.bz2
volse-hubzilla-71294faf2c182a678e5889b2ff9cabed16d83c82.zip
Merge branch 'master' of git://github.com/tobiasd/friendika
-rw-r--r--include/bbcode.php3
-rw-r--r--mod/dfrn_request.php2
-rw-r--r--mod/like.php2
-rw-r--r--view/de/profile_advanced.php4
-rw-r--r--view/en/profile_advanced.php4
-rw-r--r--view/it/profile_advanced.php4
6 files changed, 10 insertions, 9 deletions
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\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' <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" >$2</a>', $Text);
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 {
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]' ;
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 .= '<div id="advanced-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',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')))
. "</div>\r\n</div>";
$o .= '<div id="advanced-profile-dob-end"></div>';
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 .= '<div id="advanced-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',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')))
. "</div>\r\n</div>";
$o .= '<div id="advanced-profile-dob-end"></div>';
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 .= '<div id="advanced-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',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')))
. "</div>\r\n</div>";
$o .= '<div id="advanced-profile-dob-end"></div>';