From f9381ed746009348462f4f96ed397fabab4e172e Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 6 Feb 2014 13:32:29 -0800 Subject: notification bug - don't use $r, we already set it to something else that we need further on. --- include/items.php | 6 ++++-- view/en/htconfig.tpl | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index 8b9cc8d04..b7919ade6 100755 --- a/include/items.php +++ b/include/items.php @@ -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) diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 28fdd04f0..840e7a124 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -65,12 +65,13 @@ $a->config['system']['access_policy'] = ACCESS_PRIVATE; $a->config['system']['sellpage'] = ''; // Maximum size of an imported message, 0 is unlimited +// FIXME - NOT currently implemented. $a->config['system']['max_import_size'] = 200000; // maximum size of uploaded photos -$a->config['system']['maximagesize'] = 3000000; +$a->config['system']['maximagesize'] = 12000000; // Location of PHP command line processor -- cgit v1.2.3 From 3e677ec53de7517c249114dd30539141fbde85e3 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 6 Feb 2014 13:54:39 -0800 Subject: add bookmark tag to naked links if they're red sites. We can do this because red links are linkified when the post is submitted. Can't do this for other naked links because they only get linkified during display and won't have a taxonomy object attached to the message. --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index b7919ade6..1a26198da 100755 --- a/include/items.php +++ b/include/items.php @@ -160,7 +160,7 @@ function red_zrl_callback($matches) { $zrl = true; } if($zrl) - return $matches[1] . '[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]'; + return $matches[1] . '#^[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]'; return $matches[0]; } -- cgit v1.2.3