diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-07 21:35:18 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-07 21:35:18 +0100 |
| commit | 4c0f9a91b95025f08e3c4e2739cb5f4186726023 (patch) | |
| tree | 3b19b8c3aa086e4931aac9790d298b2306f71ff7 /include/items.php | |
| parent | c26ae94592dda51a40903ea65f117fd7dd9d0ef3 (diff) | |
| parent | f62ec4132ed571288737423de386054a4cc8b0d5 (diff) | |
| download | volse-hubzilla-4c0f9a91b95025f08e3c4e2739cb5f4186726023.tar.gz volse-hubzilla-4c0f9a91b95025f08e3c4e2739cb5f4186726023.tar.bz2 volse-hubzilla-4c0f9a91b95025f08e3c4e2739cb5f4186726023.zip | |
Merge branch 'upstream'
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php index 8b9cc8d04..88b258604 100755 --- a/include/items.php +++ b/include/items.php @@ -160,8 +160,8 @@ function red_zrl_callback($matches) { $zrl = true; } if($zrl) - return $matches[1] . '[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]'; - return $matches[0]; + return $matches[1] . '#^[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]'; + return $matches[1] . '#^[url=' . $matches[2] . ']' . $matches[2] . '[/url]'; } @@ -2109,11 +2109,13 @@ function send_status_notifications($post_id,$item) { $link = get_app()->get_baseurl() . '/display/' . $item['mid']; - $r = q("select id from notify where link = '%s' and uid = %d limit 1", + + $y = q("select id from notify where link = '%s' and uid = %d limit 1", dbesc($link), intval($item['uid']) ); - if($r) + + if($y) $notify = false; if(! $notify) |