aboutsummaryrefslogtreecommitdiffstats
path: root/addon/facebook
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-06-07 22:13:07 -0700
committerFriendika <info@friendika.com>2011-06-07 22:13:07 -0700
commite2f1540f25cae5b647fbebacac105d03cff17502 (patch)
treef4ae61e2cca0f923c919edc80a2ebc2a0f1e5e15 /addon/facebook
parent33fe26ecb01ec009a639c4c8fdfc4f93b2bd34ac (diff)
downloadvolse-hubzilla-e2f1540f25cae5b647fbebacac105d03cff17502.tar.gz
volse-hubzilla-e2f1540f25cae5b647fbebacac105d03cff17502.tar.bz2
volse-hubzilla-e2f1540f25cae5b647fbebacac105d03cff17502.zip
events, continued. Also better regex matching accounting for empty elements
Diffstat (limited to 'addon/facebook')
-rw-r--r--addon/facebook/facebook.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index 657ba7dc2..9e41065de 100644
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -525,7 +525,7 @@ function facebook_post_hook(&$a,&$b) {
$search_str = $a->get_baseurl() . '/search';
- if(preg_match("/\[url=(.+?)\](.+?)\[\/url\]/is",$msg,$matches)) {
+ if(preg_match("/\[url=(.*?)\](.*?)\[\/url\]/is",$msg,$matches)) {
// don't use hashtags for message link
@@ -536,12 +536,12 @@ function facebook_post_hook(&$a,&$b) {
}
}
- $msg = preg_replace("/\[url=(.+?)\](.+?)\[\/url\]/is",'$2 $1',$msg);
+ $msg = preg_replace("/\[url=(.*?)\](.*?)\[\/url\]/is",'$2 $1',$msg);
- if(preg_match("/\[img\](.+?)\[\/img\]/is",$msg,$matches))
+ if(preg_match("/\[img\](.*?)\[\/img\]/is",$msg,$matches))
$image = $matches[1];
- $msg = preg_replace("/\[img\](.+?)\[\/img\]/is", t('Image: ') . '$1', $msg);
+ $msg = preg_replace("/\[img\](.*?)\[\/img\]/is", t('Image: ') . '$1', $msg);
if((strpos($link,$a->get_baseurl()) !== false) && (! $image))
$image = $a->get_baseurl() . '/images/friendika-64.jpg';
@@ -557,7 +557,7 @@ function facebook_post_hook(&$a,&$b) {
$msg .= "\n";
foreach($arr as $r) {
$matches = false;
- $cnt = preg_match('|\[attach\]href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" title=\"(.+?)\"\[\/attach\]|',$r,$matches);
+ $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
if($cnt) {
$msg .= $matches[1];
}