aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-06 13:32:29 -0800
committerfriendica <info@friendica.com>2014-02-06 13:32:29 -0800
commitf9381ed746009348462f4f96ed397fabab4e172e (patch)
tree694e04c1d1a2236cd342548abca786dec214fd75
parent7a522be20bd66a0a904dcddf33d53e59aa04a92d (diff)
downloadvolse-hubzilla-f9381ed746009348462f4f96ed397fabab4e172e.tar.gz
volse-hubzilla-f9381ed746009348462f4f96ed397fabab4e172e.tar.bz2
volse-hubzilla-f9381ed746009348462f4f96ed397fabab4e172e.zip
notification bug - don't use $r, we already set it to something else that we need further on.
-rwxr-xr-xinclude/items.php6
-rw-r--r--view/en/htconfig.tpl3
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