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

Merge https://github.com/friendica/red into zpull

Browse Source 
Conflicts:
	mod/directory.php
This commit is contained in:
friendica
2013-11-09 12:14:06 -08:00
parent b2bb308e24 1f16dd3bb0
commit e06b0aa767
5 changed files with 55 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mod/directory.php
View File

@@ -19,8 +19,10 @@ function directory_aside(&$a) {
return;
}
$a->set_widget('dir_sort_order',dir_sort_links());
$a->set_widget('safe_search',dir_safe_mode());
$a->set_widget('dir_sort_order',dir_sort_links());
}
@@ -33,8 +35,10 @@ function directory_content(&$a) {
$safe_mode = 1;
if(local_user()) {
$safe_mode = get_pconfig(local_user(),'directory','safe_mode');
$observer = get_observer_hash();
if($observer) {
$safe_mode = get_xconfig($observer,'directory','safe_mode');
}
if($safe_mode === false)
$safe_mode = 1;
@@ -42,7 +46,10 @@ function directory_content(&$a) {
$safe_mode = intval($safe_mode);
if(x($_REQUEST,'safe'))
$safe_mode = intval($_REQUEST['safe']);
$safe_mode = (intval($_REQUEST['safe']));
$o = '';
nav_set_selected('directory');
@@ -94,6 +101,7 @@ function directory_content(&$a) {
$kw = ((intval($numtags)) ? $numtags : 24);
$query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : '');
if($search)
$query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search);
if(strpos($search,'@'))