No need to explicitely include relation.lib its anyway included in co…

…mmon.inc
NenadGajic · Jul 26, 2010 · ee767e2 · ee767e2
1 parent bcc372b
commit ee767e2
Show file tree

Hide file tree

Showing 42 changed files with 4 additions and 74 deletions.
diff --git a/browse_foreigners.php b/browse_foreigners.php
@@ -22,7 +22,6 @@
  * Displays the frame
  */
 $per_page = 200;
-require_once './libraries/relation.lib.php'; // foreign keys
 require_once './libraries/transformations.lib.php'; // Transformations
 $cfgRelation = PMA_getRelationsParam();
 $foreigners  = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE);

diff --git a/chk_rel.php b/chk_rel.php
@@ -10,7 +10,6 @@
  */
 require_once './libraries/common.inc.php';
 require_once './libraries/header.inc.php';
-require_once './libraries/relation.lib.php';
 
 
 /**

diff --git a/db_datadict.php b/db_datadict.php
@@ -18,10 +18,10 @@
 /**
  * Gets the relations settings
  */
-require_once './libraries/relation.lib.php';
+$cfgRelation  = PMA_getRelationsParam();
+
 require_once './libraries/transformations.lib.php';
 
-$cfgRelation  = PMA_getRelationsParam();
 
 /**
  * Check parameters

diff --git a/db_operations.php b/db_operations.php
@@ -262,7 +262,6 @@
  * Settings for relations stuff
  */
 
-require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 /**

diff --git a/db_printview.php b/db_printview.php
@@ -26,7 +26,6 @@
 /**
  * Settings for relations stuff
  */
-require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 /**

diff --git a/db_qbe.php b/db_qbe.php
@@ -11,7 +11,6 @@
  */
 require_once './libraries/common.inc.php';
 require_once './libraries/Table.class.php';
-require_once './libraries/relation.lib.php';
 
 
 /**

diff --git a/db_tracking.php b/db_tracking.php
@@ -17,9 +17,6 @@
 $sub_part = '_structure';
 require './libraries/db_info.inc.php';
 
-// Get relation settings
-require_once './libraries/relation.lib.php';
-
 // Work to do?
 //  (here, do not use $_REQUEST['db] as it can be crafted)
 if (isset($_REQUEST['delete_tracking']) && isset($_REQUEST['table'])) {

diff --git a/export.php b/export.php
@@ -383,7 +383,6 @@ function PMA_exportOutputHandler($line)
 $do_comments = isset($GLOBALS[$what . '_comments']);
 $do_mime     = isset($GLOBALS[$what . '_mime']);
 if ($do_relation || $do_comments || $do_mime) {
-    require_once './libraries/relation.lib.php';
     $cfgRelation = PMA_getRelationsParam();
 }
 if ($do_mime) {

diff --git a/index.php b/index.php
@@ -32,11 +32,6 @@
  */
 require_once './libraries/common.inc.php';
 
-/**
- * Includes the ThemeManager if it hasn't been included yet
- */
-require_once './libraries/relation.lib.php';
-
 // free the session file, for the other frames to be loaded
 session_write_close();
 

diff --git a/libraries/Table.class.php b/libraries/Table.class.php
@@ -781,7 +781,6 @@ static public function moveCopy($source_db, $source_table, $target_db, $target_t
             $GLOBALS['sql_query']      .= "\n\n" . $sql_insert_data . ';';
         }
 
-        require_once './libraries/relation.lib.php';
         $GLOBALS['cfgRelation'] = PMA_getRelationsParam();
 
         // Drops old table if the user has requested to move it
@@ -1057,7 +1056,6 @@ function rename($new_name, $new_db = null, $is_view = false)
          * @todo move into extra function PMA_Relation::renameTable($new_name, $old_name, $new_db, $old_db)
          */
         // Move old entries from comments to new table
-        require_once './libraries/relation.lib.php';
         $GLOBALS['cfgRelation'] = PMA_getRelationsParam();
         if ($GLOBALS['cfgRelation']['commwork']) {
             $remove_query = '

diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php
@@ -5,11 +5,6 @@
  * @package phpMyAdmin
  */
 
-/**
- * Gets relation settings
- */
-require_once './libraries/relation.lib.php';
-
 /**
  * This class tracks changes on databases, tables and views.
  * For more information please see phpMyAdmin/Documentation.html

diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php
@@ -6,11 +6,6 @@
  * @package phpMyAdmin
  */
 
-/**
- *
- */
-require_once './libraries/relation.lib.php';
-
 /**
  * Defines the bookmark parameters for the current user
  *

diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php
@@ -13,7 +13,6 @@
  */
 require_once './libraries/common.inc.php';
 
-require_once './libraries/relation.lib.php';
 /**
  * Gets the relation settings
  */

diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
@@ -14,7 +14,6 @@
 require_once './libraries/Table.class.php';
 
 // Get relations & co. status
-require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 

diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
@@ -49,8 +49,6 @@
 /**
  * for PMA_setHistory()
  */
-require_once './libraries/relation.lib.php';
-
 if (! PMA_isValid($_REQUEST['no_history']) && empty($GLOBALS['error_message'])
  && ! empty($GLOBALS['sql_query'])) {
     PMA_setHistory(PMA_ifSetOr($GLOBALS['db'], ''),

diff --git a/libraries/header.inc.php b/libraries/header.inc.php
@@ -143,7 +143,6 @@
                 /**
                  * Settings for relations stuff
                  */
-                require_once './libraries/relation.lib.php';
                 $cfgRelation = PMA_getRelationsParam();
 
                 // Get additional information about tables for tooltip is done

diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php
@@ -12,7 +12,6 @@
 /**
  * Load relations.
  */
-require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 /**

diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php
@@ -9,11 +9,6 @@
     exit;
 }
 
-/**
- *
- */
-require_once './libraries/relation.lib.php';
-
 /**
  * Cleanu column related relation stuff
  *

diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
@@ -117,7 +117,6 @@
 
 $header_cells[] = '<abbr title="AUTO_INCREMENT">' . ($display_type == 'horizontal' ? 'A_I' : 'AUTO_INCREMENT') . '</abbr>';
 
-require_once './libraries/relation.lib.php';
 require_once './libraries/transformations.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 

diff --git a/main.php b/main.php
@@ -309,7 +309,6 @@
  * Check whether relations are supported.
  */
 if ($server > 0) {
-    require_once './libraries/relation.lib.php';
     $cfgRelation = PMA_getRelationsParam();
     if(!$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
         $message = PMA_Message::notice(__('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.'));

diff --git a/navigation.php b/navigation.php
@@ -110,9 +110,8 @@ function PMA_exitNavigationFrame()
 $db_start = $GLOBALS['db'];
 
 /**
- * the relation library
+ * the relation settings
  */
-require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 /**

diff --git a/pdf_pages.php b/pdf_pages.php
@@ -20,7 +20,6 @@
 /**
  * Settings for relation stuff
  */
-require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 // This is to avoid "Command out of sync" errors. Before switching this to

diff --git a/pdf_schema.php b/pdf_schema.php
@@ -13,7 +13,6 @@
 /**
  * Settings for relation stuff
  */
-require_once './libraries/relation.lib.php';
 require_once './libraries/transformations.lib.php';
 require_once './libraries/Index.class.php';
 

diff --git a/pmd_common.php b/pmd_common.php
@@ -13,7 +13,6 @@
 
 $GLOBALS['PMD']['STYLE']          = 'default';
 
-require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 $GLOBALS['script_display_field'] =

diff --git a/pmd_display_field.php b/pmd_display_field.php
@@ -8,7 +8,6 @@
  *
  */
 include_once 'pmd_common.php';
-require_once './libraries/relation.lib.php';
 
 
 $table = $T;

diff --git a/pmd_pdf.php b/pmd_pdf.php
@@ -15,8 +15,6 @@
     include_once 'pmd_save_pos.php';
 }
 
-require_once './libraries/relation.lib.php';
-
 if (isset($scale) && ! isset($createpage)) {
     if (empty($pdf_page_number)) {
         die("<script>alert('Pages not found!');history.go(-2);</script>");

diff --git a/pmd_relation_new.php b/pmd_relation_new.php
@@ -11,7 +11,6 @@
 include_once 'pmd_common.php';
 $die_save_pos = 0;
 include_once 'pmd_save_pos.php';
-require_once './libraries/relation.lib.php';
 extract($_POST, EXTR_SKIP);
 
 $tables = PMA_DBI_get_tables_full($db, $T1);

diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php
@@ -9,7 +9,6 @@
  *
  */
 include_once 'pmd_common.php';
-require_once './libraries/relation.lib.php';
 extract($_POST, EXTR_SKIP);
 extract($_GET, EXTR_SKIP);
 $die_save_pos = 0;

diff --git a/pmd_save_pos.php b/pmd_save_pos.php
@@ -9,7 +9,6 @@
  *
  */
 include_once 'pmd_common.php';
-require_once './libraries/relation.lib.php';
 
 $cfgRelation = PMA_getRelationsParam();
 

diff --git a/querywindow.php b/querywindow.php
@@ -50,9 +50,8 @@
 PMA_outBufferPre();
 
 /**
- * load relations
+ * load relation params
  */
-require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 /**

diff --git a/sql.php b/sql.php
@@ -585,7 +585,6 @@
     }
 
     if (strlen($db)) {
-        require_once './libraries/relation.lib.php';
         $cfgRelation = PMA_getRelationsParam();
     }
 

diff --git a/tbl_addfield.php b/tbl_addfield.php
@@ -164,7 +164,6 @@
 
     if ($result === true) {
         // If comments were sent, enable relation stuff
-        require_once './libraries/relation.lib.php';
         require_once './libraries/transformations.lib.php';
 
         // Update comment table for mime types [MIME]

diff --git a/tbl_alter.php b/tbl_alter.php
@@ -105,7 +105,6 @@
         /**
          * If comments were sent, enable relation stuff
          */
-        require_once './libraries/relation.lib.php';
         require_once './libraries/transformations.lib.php';
 
         // updaet field names in relation

diff --git a/tbl_change.php b/tbl_change.php
@@ -44,11 +44,6 @@
     $cfg['ShowFieldTypesInDataEditView'] = $_REQUEST['ShowFieldTypesInDataEditView'];
 }
 
-/**
- * load relation data, foreign keys
- */
-require_once './libraries/relation.lib.php';
-
 /**
  * file listing
  */

diff --git a/tbl_create.php b/tbl_create.php
@@ -223,7 +223,6 @@
     if ($result) {
 
         // If comments were sent, enable relation stuff
-        require_once './libraries/relation.lib.php';
         require_once './libraries/transformations.lib.php';
 
         // Update comment table for mime types [MIME]

diff --git a/tbl_operations.php b/tbl_operations.php
@@ -23,7 +23,6 @@
 /**
  * Gets relation settings
  */
-require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();
 
 /**

diff --git a/tbl_printview.php b/tbl_printview.php
@@ -29,7 +29,6 @@
 /**
  * Gets the relations settings
  */
-require_once './libraries/relation.lib.php';
 require_once './libraries/transformations.lib.php';
 require_once './libraries/Index.class.php';
 

diff --git a/tbl_relation.php b/tbl_relation.php
@@ -38,8 +38,6 @@
  */
 require_once './libraries/tbl_links.inc.php';
 
-require_once './libraries/relation.lib.php';
-
 $options_array = array(
     'CASCADE'   => 'CASCADE',
     'SET_NULL'  => 'SET NULL',

diff --git a/tbl_select.php b/tbl_select.php
@@ -14,7 +14,6 @@
  * Gets some core libraries
  */
 require_once './libraries/common.inc.php';
-require_once './libraries/relation.lib.php'; // foreign keys
 require_once './libraries/mysql_charsets.lib.php';
 
 $GLOBALS['js_include'][] = 'tbl_change.js';

diff --git a/tbl_structure.php b/tbl_structure.php
@@ -11,7 +11,6 @@
  */
 require_once './libraries/common.inc.php';
 require_once './libraries/mysql_charsets.lib.php';
-require_once './libraries/relation.lib.php';
 
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
 
@@ -199,7 +198,6 @@
 $mime_map = array();
 
 if ($GLOBALS['cfg']['ShowPropertyComments']) {
-    require_once './libraries/relation.lib.php';
     require_once './libraries/transformations.lib.php';
 
     //$cfgRelation = PMA_getRelationsParam();

diff --git a/tbl_tracking.php b/tbl_tracking.php
@@ -15,9 +15,6 @@
 $url_params['goto'] = 'tbl_tracking.php';;
 $url_params['back'] = 'tbl_tracking.php';
 
-// Get relation settings
-require_once './libraries/relation.lib.php';
-
 // Init vars for tracking report
 if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
     $data = PMA_Tracker::getTrackedData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version']);

diff --git a/transformation_wrapper.php b/transformation_wrapper.php
@@ -14,7 +14,6 @@
  * Gets a core script and starts output buffering work
  */
 require_once './libraries/common.inc.php';
-require_once './libraries/relation.lib.php'; // foreign keys
 require_once './libraries/transformations.lib.php'; // Transformations
 $cfgRelation = PMA_getRelationsParam();
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ @@
      */
     require_once './libraries/common.inc.php';
     require_once './libraries/header.inc.php';
-    require_once './libraries/relation.lib.php';
     /**
@@ Expand Down @@