Merge branch 'master' into configurable-privacy2

3 files changed, 26 insertions, 1 deletions

diff --git a/data/config.default.php b/data/config.default.php
index b975fac..8c47e0b 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -470,6 +470,21 @@ $filetypes = array(
 );
 
 /**
+ * Link protocols that are allowed for newly added bookmarks.
+ * This prevents i.e. adding javascript: links.
+ *
+ * @link http://en.wikipedia.org/wiki/URI_scheme
+ *
+ * @var array
+ */
+$allowedProtocols = array(
+    'ftp', 'ftps',
+    'http', 'https',
+    'mailto', 'nntp',
+    'xmpp'
+);
+
+/**
  * Enable the "common bookmark description" functionality
  *
  * @var boolean
diff --git a/data/schema/6.sql b/data/schema/6.sql
new file mode 100644
index 0000000..4ae7cb9
--- /dev/null
+++ b/data/schema/6.sql
@@ -0,0 +1,4 @@
+CREATE TABLE `sc_version` (
+  `schema_version` int(11) NOT NULL
+) DEFAULT CHARSET=utf8;
+INSERT INTO `sc_version` (`schema_version`) VALUES ('6');
diff --git a/data/tables.sql b/data/tables.sql
index c61c2f5..7a9c5bd 100644
--- a/data/tables.sql
+++ b/data/tables.sql
@@ -182,4 +182,10 @@ CREATE TABLE `sc_votes` (
   UNIQUE KEY `bid_2` (`bId`,`uId`),
   KEY `bid` (`bId`),
   KEY `uid` (`uId`)
-) CHARACTER SET utf8 COLLATE utf8_general_ci ;
\ No newline at end of file
+) CHARACTER SET utf8 COLLATE utf8_general_ci ;
+
+
+CREATE TABLE `sc_version` (
+  `schema_version` int(11) NOT NULL
+) DEFAULT CHARSET=utf8;
+INSERT INTO `sc_version` (`schema_version`) VALUES ('6');