Removed the $_TABLES['maillist'] table

Geeklog-Core · Jan 24, 2022 · 86d3a2c · 86d3a2c
1 parent d262e3f
commit 86d3a2c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 23 deletions.
diff --git a/sql/mysql_tableanddata.php b/sql/mysql_tableanddata.php
@@ -203,14 +203,6 @@
 ) ENGINE=MyISAM
 ";
 
-$_SQL[] = "
-CREATE TABLE {$_TABLES['maillist']} (
-  code int(1) NOT NULL default '0',
-  name char(32) default NULL,
-  PRIMARY KEY  (code)
-) ENGINE=MyISAM
-";
-
 $_SQL[] = "
 CREATE TABLE {$_TABLES['pingservice']} (
   pid smallint(5) unsigned NOT NULL auto_increment,
@@ -758,9 +750,6 @@
 $_DATA[] = "INSERT INTO {$_TABLES['groups']} (grp_id, grp_name, grp_descr, grp_gl_core) VALUES (18, 'Language Admin', 'Has full access to language', 1);";
 $_DATA[] = "INSERT INTO {$_TABLES['groups']} (grp_id, grp_name, grp_descr, grp_gl_core) VALUES (19, 'Theme Admin', 'Has full access to themes', 1);";
 
-$_DATA[] = "INSERT INTO {$_TABLES['maillist']} (code, name) VALUES (0,'Don\'t Email') ";
-$_DATA[] = "INSERT INTO {$_TABLES['maillist']} (code, name) VALUES (1,'Email Headlines Each Night') ";
-
 $_DATA[] = "INSERT INTO {$_TABLES['pingservice']} (pid, name, site_url, ping_url, method, is_enabled) VALUES (1, 'Ping-O-Matic', 'http://pingomatic.com/', 'http://rpc.pingomatic.com/', 'weblogUpdates.ping', 1)";
 
 $_DATA[] = "INSERT INTO {$_TABLES['routes']} (method, rule, route, priority) VALUES (1, '/article/@sid', '/article.php?story=@sid', 100)";

diff --git a/sql/pgsql_tableanddata.php b/sql/pgsql_tableanddata.php
@@ -198,15 +198,6 @@
 )
 ";
 
-
-$_SQL[] = "
-CREATE TABLE {$_TABLES['maillist']} (
-  code SERIAL,
-  name varchar(32) default NULL,
-  PRIMARY KEY (code)
-)
-";
-
 $_SQL[] = "
 CREATE TABLE {$_TABLES['pingservice']} (
   pid SERIAL,
@@ -772,9 +763,6 @@
 $_DATA[] = "INSERT INTO {$_TABLES['groups']} (grp_id, grp_name, grp_descr, grp_gl_core) VALUES ((SELECT nextval('{$_TABLES['groups']}_grp_id_seq')), 'Language Admin', 'Has full access to language', 1);";
 $_DATA[] = "INSERT INTO {$_TABLES['groups']} (grp_id, grp_name, grp_descr, grp_gl_core) VALUES ((SELECT nextval('{$_TABLES['groups']}_grp_id_seq')), 'Theme Admin', 'Has full access to themes', 1);";
 
-$_DATA[] = "INSERT INTO {$_TABLES['maillist']} (code, name) VALUES ((SELECT nextval('{$_TABLES['maillist']}_code_seq')),'Don''t Email') ";
-$_DATA[] = "INSERT INTO {$_TABLES['maillist']} (code, name) VALUES ((SELECT nextval('{$_TABLES['maillist']}_code_seq')),'Email Headlines Each Night') ";
-
 $_DATA[] = "INSERT INTO {$_TABLES['pingservice']} (pid, name, site_url, ping_url, method, is_enabled) VALUES ((SELECT nextval('{$_TABLES['pingservice']}_pid_seq')), 'Ping-O-Matic', 'http://pingomatic.com/', 'http://rpc.pingomatic.com/', 'weblogUpdates.ping', 1)";
 
 $_DATA[] = "INSERT INTO {$_TABLES['routes']} (method, rule, route, priority) VALUES (1, '/article/@sid', '/article.php?story=@sid', 100)";

diff --git a/sql/updates/mysql_2.2.1_to_2.2.2.php b/sql/updates/mysql_2.2.1_to_2.2.2.php
@@ -6,6 +6,7 @@
 // Drop tables
 $_SQL[] = "DROP TABLE {$_TABLES['cookiecodes']}";
 $_SQL[] = "DROP TABLE {$_TABLES['dateformats']}";
+$_SQL[] = "DROP TABLE {$_TABLES['maillist']}";
 
 /**
  * Add/Edit/Delete config options for new version

diff --git a/sql/updates/pgsql_2.2.1_to_2.2.2.php b/sql/updates/pgsql_2.2.1_to_2.2.2.php
@@ -6,6 +6,7 @@
 // Drop $_tables
 $_SQL[] = "DROP TABLE {$_TABLES['cookiecodes']}";
 $_SQL[] = "DROP TABLE {$_TABLES['dateformats']}";
+$_SQL[] = "DROP TABLE {$_TABLES['maillist']}";
 
 /**
  * Add/Edit/Delete config options for new version