summaryrefslogtreecommitdiffstatshomepage
path: root/www/importNetscape.php
diff options
context:
space:
mode:
authorGravatar Christian Weiske2011-05-13 06:57:54 +0200
committerGravatar Christian Weiske2011-05-13 06:57:54 +0200
commit803b83fb7d051593066b5224a59fbf3ec6efc824 (patch)
tree173c97393f9e211b05f8c73793c180a1b88799b0 /www/importNetscape.php
parentfbfbd8d5cae579058b5d31b97c062cefd9bb36b6 (diff)
parent88d7b9631b444cef28115fb8e0bae736b45e557e (diff)
downloadscuttle-803b83fb7d051593066b5224a59fbf3ec6efc824.tar.gz
scuttle-803b83fb7d051593066b5224a59fbf3ec6efc824.zip
Merge branch 'master' into ssl-client-certs
Diffstat (limited to 'www/importNetscape.php')
-rw-r--r--www/importNetscape.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/importNetscape.php b/www/importNetscape.php
index e23c156..b476c40 100644
--- a/www/importNetscape.php
+++ b/www/importNetscape.php
@@ -28,7 +28,7 @@ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
/* Managing all possible inputs */
// First input is $_FILES
// Other inputs
-isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', '');
+isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', $GLOBALS['defaults']['privacy']);
$countImportedBookmarks = 0;
$tplVars['msg'] = '';
@@ -39,7 +39,7 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
if (is_numeric(POST_STATUS)) {
$status = intval(POST_STATUS);
} else {
- $status = 2;
+ $status = $GLOBALS['defaults']['privacy'];
}
// File handle