moved table related output after possible table changes (bug #1375752?, partly discussion of #1373804)

libraries/tbl_properties_links.inc.php

@@ -13,6 +13,28 @@ PMA_checkParameters(array('db', 'table'));
  */
 require_once('./libraries/bookmark.lib.php');
 
+
+/**
+ * Set parameters for links
+ */
+$url_query = PMA_generate_common_url($db, $table);
+$url_params = array(
+    'db' => $db,
+    'table' => $table,
+);
+
+/**
+ * Defines the urls to return to in case of error in a sql statement
+ */
+$err_url_0 = $cfg['DefaultTabDatabase'] . PMA_generate_common_url( array( 'db' => $db, ) );
+$err_url   = $cfg['DefaultTabTable'] . PMA_generate_common_url( $url_params );
+
+/**
+ * Displays headers
+ */
+$js_to_run = 'functions.js';
+require_once('./libraries/header.inc.php');
+
 /**
  * Displays links
  */

tbl_properties_common.php

@@ -18,29 +18,9 @@ if ( PMA_MYSQL_INT_VERSION >= 50002 && $db === 'information_schema' ) {
     $db_is_information_schema = false;
 }
 
-/**
- * Defines the urls to return to in case of error in a sql statement
- */
-$err_url_0 = $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db);
-$err_url   = $cfg['DefaultTabTable'] . '?' . PMA_generate_common_url($db, $table);
-
-
 /**
  * Ensures the database and the table exist (else move to the "parent" script)
  */
 require_once('./libraries/db_table_exists.lib.php');
 
-
-/**
- * Displays headers
- */
-$js_to_run = 'functions.js';
-require_once('./libraries/header.inc.php');
-
-
-/**
- * Set parameters for links
- */
-$url_query = PMA_generate_common_url($db, $table);
-
 ?>