Minor database fixups

* NewDataDictionary is incorrect, use 'new Dictionary' instead
* db_table_exists should factor in new approach to prefixes and suffixes
* plugin_api doesn't need to check if the 'plugin' table exists

application/core/database_api.php

@@ -315,10 +315,14 @@ function db_insert_id( $table = null, $field = "id" ) {
  * @return bool indicating whether the table exists
  */
 function db_table_exists( $tableName ) {
+	global $g_db;
+
 	if( is_blank( $tableName ) ) {
 		return false;
 	}
 
+	$tableName = $g_db->getTableNamePrefix() . $tableName . $g_db->getTableNameSuffix();
+
 	$tables = db_get_table_list();
 
 	# Can't use in_array() since it is case sensitive

application/core/plugin_api.php

@@ -643,7 +643,7 @@ function plugin_upgrade( $p_plugin ) {
 	$t_schema = $p_plugin->schema();
 
 	global $g_db;
-	$t_dict = NewDataDictionary( $g_db );
+	$t_dict = new Dictionary( $g_db );
 
 	$i = $t_schema_version + 1;
 	while( $i < count( $t_schema ) ) {
@@ -844,7 +844,7 @@ function plugin_register_installed() {
  * Post-signals EVENT_PLUGIN_INIT.
  */
 function plugin_init_installed() {
-	if( OFF == config_get_global( 'plugins_enabled' ) || !db_table_exists( 'plugin' ) ) {
+	if( config_get_global( 'plugins_enabled' ) == OFF ) {
 		return;
 	}
 

public/admin/upgrade_unattended.php

@@ -130,7 +130,7 @@ function print_test_result( $p_result, $p_hard_fail = true, $p_message = '' ) {
 
 while(( $i <= $lastid ) && !$g_failed ) {
 	echo 'Create Schema ( ' . $upgrade[$i][0] . ' on ' . $upgrade[$i][1][0] . ' )';
-	$dict = NewDataDictionary( $g_db );
+	$dict = new Dictionary( $g_db );
 
 	if( $upgrade[$i][0] == 'InsertData' ) {
 		$sqlarray = call_user_func_array( $upgrade[$i][0], $upgrade[$i][1] );