summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2011-05-13 06:57:54 +0200
committerChristian Weiske <cweiske@cweiske.de>2011-05-13 06:57:54 +0200
commit803b83fb7d051593066b5224a59fbf3ec6efc824 (patch)
tree173c97393f9e211b05f8c73793c180a1b88799b0 /data
parentfbfbd8d5cae579058b5d31b97c062cefd9bb36b6 (diff)
parent88d7b9631b444cef28115fb8e0bae736b45e557e (diff)
downloadsemanticscuttle-803b83fb7d051593066b5224a59fbf3ec6efc824.tar.gz
semanticscuttle-803b83fb7d051593066b5224a59fbf3ec6efc824.tar.bz2
Merge branch 'master' into ssl-client-certs
Diffstat (limited to 'data')
-rw-r--r--data/config.default.php17
-rw-r--r--data/config.php.dist16
2 files changed, 33 insertions, 0 deletions
diff --git a/data/config.default.php b/data/config.default.php
index b2c7307..8c47e0b 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -14,6 +14,13 @@
* @link http://sourceforge.net/projects/semanticscuttle/
*/
+/**
+ * Array for defaults.
+ *
+ * @var array
+ */
+$defaults = array();
+
/***************************************************
* HTML output configuration
@@ -508,6 +515,16 @@ $votingMode = 2;
*/
$hideBelowVoting = null;
+/**
+ * Default privacy setting for bookmarks:
+ * 0 - Public
+ * 1 - Shared with Watchlist
+ * 2 - Private
+ *
+ * @var integer
+ */
+$defaults['privacy'] = 0;
+
/****************************
* Website Thumbnails
diff --git a/data/config.php.dist b/data/config.php.dist
index c135e8e..302d55f 100644
--- a/data/config.php.dist
+++ b/data/config.php.dist
@@ -7,6 +7,7 @@
* See config.default.inc.php for more options.
*/
+
/**
* The name of this site.
*
@@ -116,6 +117,21 @@ $adminemail = 'admin@example.org';
$admin_users = array();
+/***************************************************
+ * Bookmarks
+ */
+
+/**
+ * Default privacy setting for bookmarks.
+ * 0 - Public
+ * 1 - Shared with Watchlist
+ * 2 - Private
+ *
+ * @var integer
+ */
+$defaults['privacy'] = 0;
+
+
/**
* You have completed the basic configuration!
* More options can be found in config.default.php.