harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/red into upstream

Browse Source
This commit is contained in:
marijus 2014-02-06 23:11:47 +01:00
commit 6f2c168d1a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/items.php
View File

@ -160,7 +160,7 @@ function red_zrl_callback($matches) {
$zrl = true; $zrl = true;
} }
if($zrl) if($zrl)
return $matches[1] . '[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]'; return $matches[1] . '#^[zrl=' . $matches[2] . ']' . $matches[2] . '[/zrl]';
return $matches[0]; return $matches[0];
} }
@ -2109,11 +2109,13 @@ function send_status_notifications($post_id,$item) {
$link = get_app()->get_baseurl() . '/display/' . $item['mid']; $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), dbesc($link),
intval($item['uid']) intval($item['uid'])
); );
if($r)
if($y)
$notify = false; $notify = false;
if(! $notify) if(! $notify)

3
view/en/htconfig.tpl
View File

@ -65,12 +65,13 @@ $a->config['system']['access_policy'] = ACCESS_PRIVATE;
$a->config['system']['sellpage'] = ''; $a->config['system']['sellpage'] = '';
// Maximum size of an imported message, 0 is unlimited // Maximum size of an imported message, 0 is unlimited
// FIXME - NOT currently implemented.
$a->config['system']['max_import_size'] = 200000; $a->config['system']['max_import_size'] = 200000;
// maximum size of uploaded photos // maximum size of uploaded photos
$a->config['system']['maximagesize'] = 3000000; $a->config['system']['maximagesize'] = 12000000;
// Location of PHP command line processor // Location of PHP command line processor