diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-06 23:11:47 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-06 23:11:47 +0100 |
| commit | 6f2c168d1a434b2223f09a922780617fdc07b278 (patch) | |
| tree | 0e715f778ccda1260176a7c4db60494670eb3f55 | |
| parent | a2b311991a90e1c78d30bad5504c18bb2a3c5c2a (diff) | |
| parent | 3e677ec53de7517c249114dd30539141fbde85e3 (diff) | |
| download | volse-hubzilla-6f2c168d1a434b2223f09a922780617fdc07b278.tar.gz volse-hubzilla-6f2c168d1a434b2223f09a922780617fdc07b278.tar.bz2 volse-hubzilla-6f2c168d1a434b2223f09a922780617fdc07b278.zip | |
Merge branch 'master' of https://github.com/friendica/red into upstream
| -rwxr-xr-x | include/items.php | 8 | ||||
| -rw-r--r-- | view/en/htconfig.tpl | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php index 8b9cc8d04..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]; } @@ -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 |