Merge branch 'dev'
This commit is contained in:
		@@ -3,7 +3,7 @@ function init_db_schema() {
 | 
			
		||||
  try {
 | 
			
		||||
    global $pdo;
 | 
			
		||||
 | 
			
		||||
    $db_version = "23042017_1807";
 | 
			
		||||
    $db_version = "01052017_1619";
 | 
			
		||||
 | 
			
		||||
    $stmt = $pdo->query("SHOW TABLES LIKE 'versions'"); 
 | 
			
		||||
    $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
 | 
			
		||||
@@ -231,6 +231,7 @@ function init_db_schema() {
 | 
			
		||||
          "port1" => "SMALLINT NOT NULL",
 | 
			
		||||
          "enc1" => "ENUM('TLS','SSL','PLAIN') DEFAULT 'TLS'",
 | 
			
		||||
          "delete2duplicates" => "TINYINT(1) NOT NULL DEFAULT '1'",
 | 
			
		||||
          "delete1" => "TINYINT(1) NOT NULL DEFAULT '0'",
 | 
			
		||||
          "returned_text" => "TEXT",
 | 
			
		||||
          "last_run" => "TIMESTAMP NULL DEFAULT NULL",
 | 
			
		||||
          "created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user