aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-10 23:20:07 -0800
committerfriendica <info@friendica.com>2013-11-10 23:20:07 -0800
commit0adf31eef240c8d58ba6fc471892189a69d0696b (patch)
tree0bde887f806ea01d73c31500592ab99eee669506
parentca4103debef7ecf36d93842750667e70c2a1e42a (diff)
parent888d7e05bf2fac41b52ab6b4094d6547174506c3 (diff)
downloadvolse-hubzilla-0adf31eef240c8d58ba6fc471892189a69d0696b.tar.gz
volse-hubzilla-0adf31eef240c8d58ba6fc471892189a69d0696b.tar.bz2
volse-hubzilla-0adf31eef240c8d58ba6fc471892189a69d0696b.zip
Merge https://github.com/friendica/red into zpull
-rw-r--r--include/dir_fns.php2
-rw-r--r--mod/toggle_safesearch.php7
2 files changed, 5 insertions, 4 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php
index 0d0507059..7af98bec3 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -25,7 +25,7 @@ function dir_safe_mode(&$a) {
if ($observer)
$safe_mode = get_xconfig($observer,'directory','safe_mode');
- if($safe_mode == 0)
+ if($safe_mode === '0')
$toggle = t('Enable Safe Search');
else
$toggle = t('Disable Safe Search');
diff --git a/mod/toggle_safesearch.php b/mod/toggle_safesearch.php
index 9d4e9a109..5fb18f694 100644
--- a/mod/toggle_safesearch.php
+++ b/mod/toggle_safesearch.php
@@ -6,10 +6,11 @@ $observer = get_observer_hash();
if($observer)
$safe_mode = get_xconfig($observer,'directory','safe_mode');
-
-if($safe_mode == 0)
+if ($safe_mode == '')
+ set_xconfig($observer,'directory','safe_mode', '0');
+elseif($safe_mode == '0')
set_xconfig($observer,'directory','safe_mode', '1');
-if($safe_mode == 1)
+elseif($safe_mode == '1')
set_xconfig($observer,'directory','safe_mode', '0');
if(isset($_GET['address']))