aboutsummaryrefslogtreecommitdiffstats
path: root/mod/settings.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-08-14 20:44:17 +0100
committerThomas Willingham <founder@kakste.com>2013-08-14 20:44:17 +0100
commita0dfd44f9178796eaf55e4a2ab0194c12e7dfd21 (patch)
tree31a43380cbe93e28f27c69a7d676fe6bfafbb0f4 /mod/settings.php
parent94335f237fdadd93b86b271526c25c2a77de9c40 (diff)
parentde4e4c5ebd1ab746432b21d122b5f0cfb70a9bdd (diff)
downloadvolse-hubzilla-a0dfd44f9178796eaf55e4a2ab0194c12e7dfd21.tar.gz
volse-hubzilla-a0dfd44f9178796eaf55e4a2ab0194c12e7dfd21.tar.bz2
volse-hubzilla-a0dfd44f9178796eaf55e4a2ab0194c12e7dfd21.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/settings.php')
-rw-r--r--mod/settings.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/mod/settings.php b/mod/settings.php
index 0cca41810..c39286ebc 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -330,7 +330,6 @@ function settings_post(&$a) {
$expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0);
- $expire_notes = ((x($_POST,'expire_notes')) ? intval($_POST['expire_notes']) : 0);
$expire_starred = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0);
$expire_photos = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos']) : 0);
$expire_network_only = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only']) : 0);