diff options
| author | friendica <info@friendica.com> | 2013-12-11 15:32:25 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-11 15:32:25 -0800 |
| commit | c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05 (patch) | |
| tree | cc9eef5ea3c6676cd537f2f89776ab6d3c835db1 /mod | |
| parent | 2c02f57f276658269a6cc2031fb0fc9ac0a9077c (diff) | |
| parent | 06c81e189f031a74c54aa14b1f29c93379e7cf3c (diff) | |
| download | volse-hubzilla-c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05.tar.gz volse-hubzilla-c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05.tar.bz2 volse-hubzilla-c57b6745e8d7222d9cecfb04cd81c9ef7eb25d05.zip | |
Merge https://github.com/friendica/red into zpull
Conflicts:
view/theme/redbasic/css/style.css
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/notes.php | 4 | ||||
| -rw-r--r-- | mod/toggle_safesearch.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mod/notes.php b/mod/notes.php index ce3460aa4..468b4ef26 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -6,11 +6,11 @@ function notes_init(&$a) { logger('mod_notes: ' . print_r($_REQUEST,true)); $ret = array('success' => true); - if($_REQUEST['note_text']) { + if($_REQUEST['note_text'] || $_REQUEST['note_text'] == '') { $body = escape_tags($_REQUEST['note_text']); set_pconfig(local_user(),'notes','text',$body); } logger('notes saved.'); json_return_and_die($ret); -}
\ No newline at end of file +} diff --git a/mod/toggle_safesearch.php b/mod/toggle_safesearch.php index 5fb18f694..3c800c4f3 100644 --- a/mod/toggle_safesearch.php +++ b/mod/toggle_safesearch.php @@ -3,6 +3,8 @@ function toggle_safesearch_init(&$a) { $observer = get_observer_hash(); +if (! $observer) + return; if($observer) $safe_mode = get_xconfig($observer,'directory','safe_mode'); |