Merge pull request interconnectit#160 from matt-icit/master

Fix AJAX errors when altering collation on tables
zdmvk · Nov 12, 2015 · c8dfccb · c8dfccb
2 parents 365ef7c + 867aa6c
commit c8dfccb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/srdb.class.php b/srdb.class.php
@@ -1042,8 +1042,9 @@ public function update_engine( $engine = 'MyISAM', $tables = array() ) {
 
 			$report = array( 'engine' => $engine, 'converted' => array() );
 
+			$all_tables = $this->get_tables();
+
 			if ( empty( $tables ) ) {
-				$all_tables = $this->get_tables();
 				$tables = array_keys( $all_tables );
 			}
 
@@ -1092,8 +1093,9 @@ public function update_collation( $collation = 'utf8_unicode_ci', $tables = arra
 
 			$report = array( 'collation' => $collation, 'converted' => array() );
 
+			$all_tables = $this->get_tables();
+
 			if ( empty( $tables ) ) {
-				$all_tables = $this->get_tables();
 				$tables = array_keys( $all_tables );
 			}