diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-10 14:27:41 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-10 14:27:41 -0700 |
| commit | a497d8ee66edcb6e0c29e8e16c875963d497334d (patch) | |
| tree | e48292679f625212dd76d4fa98b4cde9c7d5e440 /include | |
| parent | 43354ab385cd5c7adcc86f591159f10201420aae (diff) | |
| parent | 4bf7e4a34d166a52a10939ab0bb26ac05652f59c (diff) | |
| download | volse-hubzilla-a497d8ee66edcb6e0c29e8e16c875963d497334d.tar.gz volse-hubzilla-a497d8ee66edcb6e0c29e8e16c875963d497334d.tar.bz2 volse-hubzilla-a497d8ee66edcb6e0c29e8e16c875963d497334d.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/editpost.php
util/messages.po
view/nl/messages.po
view/nl/strings.php
Diffstat (limited to 'include')
| -rw-r--r-- | include/dir_fns.php | 2 | ||||
| -rw-r--r-- | include/text.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php index 29c05fcaa..38c92dd94 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -82,7 +82,7 @@ function get_directory_setting($observer, $setting) { if($ret === false) $ret = get_config('directory', $setting); - if($setting == 'safe_mode' && $ret === false) + if($setting == 'safemode' && $ret === false) $ret = 1; return $ret; diff --git a/include/text.php b/include/text.php index be465d0f4..a02484855 100644 --- a/include/text.php +++ b/include/text.php @@ -807,7 +807,7 @@ function contact_block() { $shown = get_pconfig($a->profile['uid'],'system','display_friend_count'); if($shown === false) - $shown = 24; + $shown = 25; if($shown == 0) return; |