Txp 4.6.2 and MySQL 5.7 compatibility

* TEXT columns can't have default values * AUTOINCREMENT columns need omitting instead of sending empty '' strings

Author: Bloke

glz_custom_fields.php

@@ -4,7 +4,7 @@
 // run this file at the command line to produce a plugin for distribution:
 // $ php abc_myplugin.php > abc_myplugin-0.1.txt
 
-$version = isset($_ENV["PLUGIN_VERSION"]) ? $_ENV["PLUGIN_VERSION"] : "1.4.0";
+$version = isset($_ENV["PLUGIN_VERSION"]) ? $_ENV["PLUGIN_VERSION"] : "1.5.0";
 
 $plugin['code_file'] = realpath('glz_custom_fields_code.php');
 $plugin['help_file'] = realpath('glz_custom_fields_help.html');
@@ -13,7 +13,7 @@
 $plugin['author'] = "Gerhard Lazu";
 $plugin['author_uri'] = "http://gerhardlazu.com";
 $plugin['contributors'] = "Randy Levine, Sam Weiss, Luca Botti, Manfre, Vladimir Siljkovic, Julian Reisenberger, Steve Dickinson, Stef Dawson, Jean-Pol Dupont";
-$plugin['compatibility'] = "4.5.1";
+$plugin['compatibility'] = "4.6.2";
 
 // Plugin load order:
 // The default value of 5 would fit most plugins, while for instance comment spam evaluators or URL redirectors

lib/db.php

@@ -258,18 +258,19 @@ function glz_new_custom_field($name, $table, $extra) {
  else if ( $table == PFX."txp_lang" ) {
  $query = "
  INSERT INTO
- `".PFX."txp_lang` (`id`,`lang`,`name`,`event`,`data`,`lastmod`)
+ `".PFX."txp_lang` (`lang`,`name`,`event`,`data`,`lastmod`)
  VALUES
- ('','{$lang}','{$custom_set}','prefs','{$name}',now())
+ ('{$lang}','{$custom_set}','prefs','{$name}',now())
  ";
  }
  else if ( $table == PFX."textpattern" ) {
  $column_type = ( $custom_set_type == "textarea" ) ? "TEXT" : "VARCHAR(255)";
+ $dflt = ( $custom_set_type == "textarea" ) ? '' : "DEFAULT ''";
  $query = "
  ALTER TABLE
  `".PFX."textpattern`
  ADD
- `custom_{$custom_field_number}` {$column_type} NOT NULL DEFAULT ''
+ `custom_{$custom_field_number}` {$column_type} NOT NULL {$dflt}
  ";
  }
  else if ( $table == PFX."custom_fields" ) {
@@ -322,11 +323,12 @@ function glz_update_custom_field($name, $table, $extra) {
  }
  else if ( ($table == PFX."textpattern") ) {
  $column_type = ( $custom_set_type == "textarea" ) ? "TEXT" : "VARCHAR(255)";
+ $dflt = ( $custom_set_type == "textarea" ) ? '' : "DEFAULT ''";
  safe_query("
  ALTER TABLE
  `".PFX."textpattern`
  MODIFY
- `{$custom_field}` {$column_type} NOT NULL DEFAULT ''
+ `{$custom_field}` {$column_type} NOT NULL {$dflt}
  ");
  }
 }