Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	mod/editpost.php
	util/messages.po
	view/nl/messages.po
	view/nl/strings.php

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;

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;