Merge commit 'upstream/master'

boot.php

@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1302' );
+define ( 'FRIENDICA_VERSION',      '2.3.1304' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1134      );
+define ( 'DB_UPDATE_VERSION',      1137      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

database.sql

@@ -34,10 +34,11 @@ CREATE TABLE IF NOT EXISTS `challenge` (
 
 CREATE TABLE IF NOT EXISTS `config` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `cat` char(255) NOT NULL,
+  `cat` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
-  `k` char(255) NOT NULL,
+  `k` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
   `v` text NOT NULL,
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`), 
+  UNIQUE KEY `access`(`cat`,`k`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
@@ -542,9 +543,10 @@ INDEX ( `batch` )
 CREATE TABLE IF NOT EXISTS `pconfig` (
 `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
 `uid` INT NOT NULL DEFAULT '0',
-`cat` CHAR( 255 ) NOT NULL ,
+`cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
-`k` CHAR( 255 ) NOT NULL ,
+`k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
-`v` MEDIUMTEXT NOT NULL
+`v` MEDIUMTEXT NOT NULL, 
+UNIQUE KEY `access`(`cat`, `k`)
 ) ENGINE = MyISAM DEFAULT CHARSET=utf8;