Git July 2010

git@phpmyadmin.net

3 participants
161 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5959-g6c3ad9e

by Michal Čihař

The branch, master has been updated via 6c3ad9e942c446abb4473b173bedf6e3d26c8ce2 (commit) from d8324ec67aa51acf7eb53aae2dc2c36114434ea8 (commit) - Log ----------------------------------------------------------------- commit 6c3ad9e942c446abb4473b173bedf6e3d26c8ce2 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 17:31:56 2010 +0200 Fix back showing login form in frames. ----------------------------------------------------------------------- Summary of changes: libraries/auth/cookie.auth.lib.php | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index a964455..870ac56 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -172,13 +172,14 @@ function PMA_auth() ?> <script src="./js/jquery/jquery-1.4.2.js" type="text/javascript"></script> <script src="./js/update-location.js" type="text/javascript"></script> -<?php -if ( false === $GLOBALS['cfg']['AllowThirdPartyFraming']) { -?> -<script src="./js/cross_framing_protection.js" type="text/javascript"></script> -<?php +<script type="text/javascript"> +//<![CDATA[ +// show login form in top frame +if (top != self) { + window.top.location.href=location; } -?> +//]]> +</script> <script src="./js/functions.js" type="text/javascript"></script> </head> hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5957-g0933b71

by Michal Čihař

The branch, master has been updated via 0933b7157d486af8fa1422fe79d6a0c8075d22c2 (commit) via 3d6e28865133b6ba1029b5cc3e82f1dd7b5d5b25 (commit) via 232ebc3c8c4c961526c9cc79a5f2605eb273fc10 (commit) from cfc7fd7a2dda8ce07647369593da3040c3603c72 (commit) - Log ----------------------------------------------------------------- commit 0933b7157d486af8fa1422fe79d6a0c8075d22c2 Merge: cfc7fd7a2dda8ce07647369593da3040c3603c72 3d6e28865133b6ba1029b5cc3e82f1dd7b5d5b25 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 17:18:16 2010 +0200 Merge remote branch 'pootle/master' commit 3d6e28865133b6ba1029b5cc3e82f1dd7b5d5b25 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Mon Jul 26 16:54:15 2010 +0200 Translation update done using Pootle. commit 232ebc3c8c4c961526c9cc79a5f2605eb273fc10 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Mon Jul 26 16:53:54 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 2348e4f..a1a3b9a 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-07-21 13:53+0200\n" -"PO-Revision-Date: 2010-07-21 14:43+0200\n" -"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" +"PO-Revision-Date: 2010-07-26 16:54+0200\n" +"Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -1674,10 +1674,9 @@ msgid "MySQL said: " msgstr "MySQL said: " #: libraries/common.lib.php:1136 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Failed to connect to SQL validator!" -msgstr "Could not connect to MySQL server" +msgstr "Failed to connect to SQL validator!" #: libraries/common.lib.php:1174 setup/lib/messages.inc.php:350 msgid "Explain SQL" @@ -7736,10 +7735,9 @@ msgid "Showing SQL query" msgstr "Showing SQL query" #: sql.php:517 -#, fuzzy #| msgid "Validate SQL" msgid "Validated SQL" -msgstr "Validate SQL" +msgstr "Validated SQL" #: sql.php:638 #, php-format hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5954-gcfc7fd7

by Michal Čihař

The branch, master has been updated via cfc7fd7a2dda8ce07647369593da3040c3603c72 (commit) from 639dc7fcf67b1277f6a0ee4d707d90daefbb975e (commit) - Log ----------------------------------------------------------------- commit cfc7fd7a2dda8ce07647369593da3040c3603c72 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 17:16:55 2010 +0200 The linked-tables infrastructure is now called phpMyAdmin configuration storage. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 41 +++++++++++++++++++---------------------- db_operations.php | 2 +- pdf_schema.php | 2 +- setup/lib/messages.inc.php | 2 +- 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3adda53..b75e9c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,8 @@ $Id$ now. + [validator] SQL validator works also with SOAP PHP extension. - [interface] Better formatting for SQL validator results. +- [doc] The linked-tables infrastructure is now called phpMyAdmin + configuration storage. 3.3.6.0 (not yet released) - bug #3033063 [core] Navi gets wrong db name diff --git a/Documentation.html b/Documentation.html index 3e5edee..d5c5d45 100644 --- a/Documentation.html +++ b/Documentation.html @@ -170,7 +170,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <ol><li><a href="#quick_install">Quick Install</a></li> <li><a href="#setup_script">Setup script usage</a></li> - <li><a href="#linked-tables">Linked-tables infrastructure</a></li> + <li><a href="#linked-tables">phpMyAdmin configuration storage</a></li> <li><a href="#upgrading">Upgrading from an older version</a></li> <li><a href="#authentication_modes">Using authentication modes</a></li> </ol> @@ -326,7 +326,7 @@ rm -rf config # remove not needed directory </li> </ol> -<h3 id="linked-tables">Linked-tables infrastructure</h3> +<h3 id="linked-tables">phpMyAdmin configuration storage</h3> <p> For a whole set of new features (bookmarks, comments, <abbr title="structured query language">SQL</abbr>-history, @@ -373,7 +373,7 @@ rm -rf config # remove not needed directory is version-specific.</p> <p> If you have upgraded your MySQL server from a version previous to 4.1.2 to - version 4.1.2 or newer and if you use the pmadb/linked table infrastructure, + version 4.1.2 or newer and if you use the phpMyAdmin configuration storage, you should run the SQL script found in <tt>scripts/upgrade_tables_mysql_4_1_2+.sql</tt>.</p> @@ -443,8 +443,9 @@ GRANT SELECT (Host, Db, User, Table_name, Table_priv, Column_priv) GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; </pre> - (this of course requires that your <a href="#linked-tables">linked-tables - infrastructure</a> be set up).<br /></li> + (this of course requires that your <a href="#linked-tables">phpMyAdmin + configuration storage</a> be set up). + <br /></li> <li>Then each of the <i>true</i> users should be granted a set of privileges on a set of particular databases. Normally you shouldn't give global @@ -865,11 +866,11 @@ since this link provides funding for phpMyAdmin. <dt id="pmadb"> <span id="cfg_Servers_pmadb">$cfg['Servers'][$i]['pmadb']</span> string </dt> - <dd>The name of the database containing the linked-tables infrastructure. + <dd>The name of the database containing the phpMyAdmin configuration storage. <br /><br /> - See the <a href="#linked-tables">Linked-tables infrastructure</a> - section in this document to see the benefits of this infrastructure, + See the <a href="#linked-tables">phpMyAdmin configuration storage</a> + section in this document to see the benefits of this feature, and for a quick way of creating this database and the needed tables. <br /><br /> @@ -878,7 +879,7 @@ since this link provides funding for phpMyAdmin. case, just put your current database name in <tt>$cfg['Servers'][$i]['pmadb']</tt>. For a multi-user installation, set this parameter to the name of your central database containing - the linked-tables infrastructure.</dd> + the phpMyAdmin configuration storage.</dd> <dt id="bookmark"> <span id="cfg_Servers_bookmarktable">$cfg['Servers'][$i]['bookmarktable']</span> string @@ -887,7 +888,7 @@ since this link provides funding for phpMyAdmin. useful for queries you often run.<br /><br /> To allow the usage of this functionality: - <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> + <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> <li>enter the table name in <tt>$cfg['Servers'][$i]['bookmarktable']</tt></li> </ul> @@ -923,8 +924,8 @@ since this link provides funding for phpMyAdmin. To allow the usage of this functionality: - <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables - infrastructure</li> + <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin + configuration storage</li> <li>put the relation table name in <tt>$cfg['Servers'][$i]['relation']</tt></li> <li>now as normal user open phpMyAdmin and for each one of your @@ -948,7 +949,7 @@ since this link provides funding for phpMyAdmin. cursor over the corresponding key.<br /> This configuration variable will hold the name of this special table. To allow the usage of this functionality: - <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> + <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> <li>put the table name in <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g. 'pma_table_info')</li> @@ -975,8 +976,7 @@ since this link provides funding for phpMyAdmin. To allow the usage of this functionality: - <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables - infrastructure</li> + <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> <li>put the correct table names in <tt>$cfg['Servers'][$i]['table_coords']</tt> and <tt>$cfg['Servers'][$i]['pdf_pages']</tt></li> @@ -1007,8 +1007,7 @@ since this link provides funding for phpMyAdmin. <br /><br /> To allow the usage of this functionality: - <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables - infrastructure</li> + <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> <li>put the table name in <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g. 'pma_column_info')</li> @@ -1048,8 +1047,7 @@ ALTER TABLE `pma_column_comments` To allow the usage of this functionality: - <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables - infrastructure</li> + <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> <li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt> (e.g. 'pma_history') </li> @@ -1081,7 +1079,7 @@ ALTER TABLE `pma_column_comments` To allow the usage of this functionality: <ul> - <li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> + <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. 'pma_tracking')</li> </ul> </dd> @@ -1152,8 +1150,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> To allow the usage of this functionality: - <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables - infrastructure</li> + <ul><li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. 'pma_designer_coords') </li> </ul> diff --git a/db_operations.php b/db_operations.php index c2464b0..eb8c6a2 100644 --- a/db_operations.php +++ b/db_operations.php @@ -461,7 +461,7 @@ if (!$is_information_schema) { if ($num_tables > 0 && !$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.')); + $message = PMA_Message::notice(__('The phpMyAdmin configuration storage has been deactivated. To find out why click %shere%s.')); $message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">', false); $message->addParam('</a>', false); /* Show error if user has configured something, notice elsewhere */ diff --git a/pdf_schema.php b/pdf_schema.php index a1c16e6..dd7426f 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -29,7 +29,7 @@ $cfgRelation = PMA_getRelationsParam(); if (!$cfgRelation['pdfwork']) { echo '<font color="red">' . __('Error') . '</font><br />' . "\n"; $url_to_goto = '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">'; - echo sprintf(__('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.'), $url_to_goto, '</a>') . "\n"; + echo sprintf(__('The phpMyAdmin configuration storage has been deactivated. To find out why click %shere%s.'), $url_to_goto, '</a>') . "\n"; } /** diff --git a/setup/lib/messages.inc.php b/setup/lib/messages.inc.php index ef1f42b..d1ceb05 100644 --- a/setup/lib/messages.inc.php +++ b/setup/lib/messages.inc.php @@ -125,7 +125,7 @@ $strSetupForm_Server_config = __('Server configuration'); $strSetupForm_Server_desc = __('Enter server connection parameters'); $strSetupForm_Server_login_options_desc = __('Enter login options for signon authentication'); $strSetupForm_Server_login_options = __('Signon login options'); -$strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@../Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation'); +$strSetupForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@../Documentation.html#linked-tables]phpMyAdmin configuration storage[/a] in documentation'); $strSetupForm_Server_pmadb = __('PMA database'); $strSetupForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.'); $strSetupForm_Server_tracking = __('Changes tracking'); hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5953-g639dc7f

by Michal Čihař

The branch, master has been updated via 639dc7fcf67b1277f6a0ee4d707d90daefbb975e (commit) via f700a73c81668adcc59d0ccc24ca89ab87bd3663 (commit) from ebc3f1b3c6a8966fbaee4f6880319d7920ec31dd (commit) - Log ----------------------------------------------------------------- commit 639dc7fcf67b1277f6a0ee4d707d90daefbb975e Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 16:46:37 2010 +0200 Simplify inclusions of vendor_config. commit f700a73c81668adcc59d0ccc24ca89ab87bd3663 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 16:44:47 2010 +0200 No need for require_once in these files. ----------------------------------------------------------------------- Summary of changes: libraries/Config.class.php | 2 +- setup/lib/config_info.inc.php | 5 ----- setup/lib/index.lib.php | 5 ----- themes.php | 4 ++-- webapp.php | 4 ++-- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 225977b..7389b9f 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -9,7 +9,7 @@ /** * Load vendor configuration. */ -require_once('./libraries/vendor_config.php'); +require('./libraries/vendor_config.php'); /** * Configuration class diff --git a/setup/lib/config_info.inc.php b/setup/lib/config_info.inc.php index afc124a..b48cb5d 100644 --- a/setup/lib/config_info.inc.php +++ b/setup/lib/config_info.inc.php @@ -15,11 +15,6 @@ if (!defined('PHPMYADMIN')) { exit; } -/** - * Load paths. - */ -require_once('./libraries/vendor_config.php'); - $cfg_db = array(); // path to config file, relative to phpMyAdmin's root path diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index 8cb2ed1..115cc9f 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -16,11 +16,6 @@ if (!defined('PHPMYADMIN')) { } /** - * Load vendor config. - */ -require_once('./libraries/vendor_config.php'); - -/** * Initializes message list */ function messages_begin() diff --git a/themes.php b/themes.php index a996030..e58933f 100644 --- a/themes.php +++ b/themes.php @@ -8,13 +8,13 @@ /** * get some globals */ -require_once './libraries/common.inc.php'; +require './libraries/common.inc.php'; /* Theme Select */ $path_to_themes = $cfg['ThemePath'] . '/'; /* set language and charset */ -require_once './libraries/header_http.inc.php'; +require './libraries/header_http.inc.php'; /* HTML header */ $page_title = 'phpMyAdmin - ' . __('Theme / Style'); diff --git a/webapp.php b/webapp.php index 1bae366..86d6bf1 100644 --- a/webapp.php +++ b/webapp.php @@ -13,11 +13,11 @@ define('PMA_MINIMUM_COMMON', true); /** * Gets core libraries and defines some variables */ -require_once './libraries/common.inc.php'; +require './libraries/common.inc.php'; /** * ZIP file handler. */ -require_once './libraries/zip.lib.php'; +require './libraries/zip.lib.php'; // ini file $parameters = array( hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5951-gebc3f1b

by Michal Čihař

The branch, master has been updated via ebc3f1b3c6a8966fbaee4f6880319d7920ec31dd (commit) from ed34bb905448199dc317734bd4c9547b9aaa3a3f (commit) - Log ----------------------------------------------------------------- commit ebc3f1b3c6a8966fbaee4f6880319d7920ec31dd Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 16:43:26 2010 +0200 Included just once. ----------------------------------------------------------------------- Summary of changes: libraries/select_lang.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index ca8c7cc..06b35f4 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -367,7 +367,7 @@ $GLOBALS['lang_path'] = './locale/'; /** * Load gettext functions. */ -require_once './libraries/php-gettext/gettext.inc'; +require './libraries/php-gettext/gettext.inc'; /** * @global string interface language hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5950-ged34bb9

by Michal Čihař

The branch, master has been updated via ed34bb905448199dc317734bd4c9547b9aaa3a3f (commit) via 5f88219d18cc76bae06757806be85fb662604bcf (commit) via 5684d400593e4b7f57038c91e18c8f89c4cf9de0 (commit) via 9da795245ef207897bbb4ddb6b0706535549b753 (commit) via 180018d4dc071a5b9a14de740be2242eab66e051 (commit) from 3910ce61212e44d944ccbd924fd50d69419af548 (commit) - Log ----------------------------------------------------------------- commit ed34bb905448199dc317734bd4c9547b9aaa3a3f Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 16:41:49 2010 +0200 Adjust documentation to gettext. commit 5f88219d18cc76bae06757806be85fb662604bcf Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 16:40:43 2010 +0200 Included only from single place, no need for require_once. commit 5684d400593e4b7f57038c91e18c8f89c4cf9de0 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 16:39:55 2010 +0200 Documentation. commit 9da795245ef207897bbb4ddb6b0706535549b753 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 16:39:04 2010 +0200 It makes no sense load translations here Either the message is translated or not, but we can not do much about it. commit 180018d4dc071a5b9a14de740be2242eab66e051 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 16:38:31 2010 +0200 Drop suppor from PMA_fatalError for str* variables. It is not used anywhere now. ----------------------------------------------------------------------- Summary of changes: config.sample.inc.php | 2 +- libraries/common.inc.php | 2 +- libraries/config.default.php | 3 +-- libraries/core.lib.php | 27 ++------------------------- 4 files changed, 5 insertions(+), 29 deletions(-) diff --git a/config.sample.inc.php b/config.sample.inc.php index 679555b..da403fd 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -94,7 +94,7 @@ $cfg['SaveDir'] = ''; /** * Default language to use, if not browser-defined or user-defined - * (you find all languages in the file libraries/select_lang.lib.php) + * (you find all languages in the locale folder) * uncomment the desired line: * default = 'en' */ diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 80866ff..a728c5a 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -557,7 +557,7 @@ $GLOBALS['footnotes'] = array(); /** * lang detection is done here */ -require_once './libraries/select_lang.lib.php'; +require './libraries/select_lang.lib.php'; /** * check for errors occurred while loading configuration diff --git a/libraries/config.default.php b/libraries/config.default.php index 28aa85e..4f71e56 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1932,8 +1932,7 @@ $cfg['DefaultLang'] = 'en'; $cfg['DefaultConnectionCollation'] = 'utf8_general_ci'; /** - * Force: always use this language - must be defined in - * libraries/select_lang.lib.php + * Force: always use this language * $cfg['Lang'] = 'en'; * * Regular expression to limit listed languages, e.g. '^(cs|en)' for Czech and diff --git a/libraries/core.lib.php b/libraries/core.lib.php index dcbf177..c1a0b4b 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -220,30 +220,7 @@ function PMA_securePath($path) */ function PMA_fatalError($error_message, $message_args = null) { - // it could happen PMA_fatalError() is called before language file is loaded - if (! isset($GLOBALS['available_languages'])) { - $GLOBALS['cfg'] = array( - 'DefaultLang' => 'en', - ); - - // Loads the language file - require_once './libraries/select_lang.lib.php'; - - // $text_dir is set in po file - if (isset($text_dir)) { - $GLOBALS['text_dir'] = $text_dir; - } - } - - // $error_message could be a language string identifier: strString - if (substr($error_message, 0, 3) === 'str') { - if (isset($$error_message)) { - $error_message = $$error_message; - } elseif (isset($GLOBALS[$error_message])) { - $error_message = $GLOBALS[$error_message]; - } - } - + /* Use format string if applicable */ if (is_string($message_args)) { $error_message = sprintf($error_message, $message_args); } elseif (is_array($message_args)) { @@ -316,7 +293,7 @@ function PMA_getTableCount($db) $num_tables--; } } - + PMA_DBI_free_result($tables); } else { $num_tables = 0; hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5945-g3910ce6

by Michal Čihař

The branch, master has been updated via 3910ce61212e44d944ccbd924fd50d69419af548 (commit) via 81a4fdf0c9567f981807684a8083e5789b112b07 (commit) via c1f076000be6ce5fa1f72b0a3ae44db69eb110ea (commit) via 2dffa21b0c3679020a23e6e3b6e6fa59fd55a361 (commit) from d291827444206eeaf25399020ad6a3d98a5e2766 (commit) - Log ----------------------------------------------------------------- commit 3910ce61212e44d944ccbd924fd50d69419af548 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 16:35:52 2010 +0200 Remove explicit inclusion of Table.class.php as it is included in common.inc anyway. commit 81a4fdf0c9567f981807684a8083e5789b112b07 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 16:35:24 2010 +0200 No need for require_once for once included code. commit c1f076000be6ce5fa1f72b0a3ae44db69eb110ea Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 16:28:56 2010 +0200 No need to require_once here. commit 2dffa21b0c3679020a23e6e3b6e6fa59fd55a361 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 16:28:23 2010 +0200 Loaded by common. ----------------------------------------------------------------------- Summary of changes: db_operations.php | 1 - db_qbe.php | 2 -- db_structure.php | 3 +-- db_tracking.php | 1 - error.php | 2 +- libraries/Theme_Manager.class.php | 5 ----- libraries/common.inc.php | 22 +++++++++++----------- libraries/database_interface.lib.php | 2 -- libraries/db_table_exists.lib.php | 5 ----- libraries/display_export.lib.php | 5 ----- libraries/display_tbl.lib.php | 1 - libraries/relation.lib.php | 5 ----- libraries/tbl_info.inc.php | 5 ----- sql.php | 1 - tbl_addfield.php | 1 - tbl_alter.php | 1 - tbl_create.php | 1 - tbl_move_copy.php | 1 - tbl_operations.php | 1 - tbl_tracking.php | 1 - view_operations.php | 1 - 21 files changed, 13 insertions(+), 54 deletions(-) diff --git a/db_operations.php b/db_operations.php index 5d48440..c2464b0 100644 --- a/db_operations.php +++ b/db_operations.php @@ -16,7 +16,6 @@ * requirements */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; require_once './libraries/mysql_charsets.lib.php'; /** diff --git a/db_qbe.php b/db_qbe.php index 5599bad..2475065 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -10,8 +10,6 @@ * requirements */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; - /** * Gets the relation settings diff --git a/db_structure.php b/db_structure.php index 899fa95..9e11821 100644 --- a/db_structure.php +++ b/db_structure.php @@ -9,7 +9,6 @@ * */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; @@ -157,7 +156,7 @@ foreach ($tables as $keyname => $each_table) { $tableReductionCount++; continue; } - + // Get valid statistics whatever is the table type $table_is_view = false; diff --git a/db_tracking.php b/db_tracking.php index 2ff54f0..1c8c5ce 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -8,7 +8,6 @@ * Run common work */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; require './libraries/db_common.inc.php'; $url_query .= '&goto=tbl_tracking.php&back=db_tracking.php'; diff --git a/error.php b/error.php index 040da49..117d070 100644 --- a/error.php +++ b/error.php @@ -9,7 +9,7 @@ /** * Input sanitizing. */ -require_once './libraries/sanitizing.lib.php'; +require './libraries/sanitizing.lib.php'; /* Get variables */ if (! empty($_REQUEST['lang']) && is_string($_REQUEST['lang'])) { diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index c5298f3..4ca8517 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -7,11 +7,6 @@ /** * - */ -require_once './libraries/Theme.class.php'; - -/** - * * @package phpMyAdmin */ class PMA_Theme_Manager diff --git a/libraries/common.inc.php b/libraries/common.inc.php index d1a6d94..80866ff 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -49,7 +49,7 @@ if (!defined('E_DEPRECATED')) { /** * the error handler */ -require_once './libraries/Error_Handler.class.php'; +require './libraries/Error_Handler.class.php'; /** * initialize the error handler @@ -78,42 +78,42 @@ define('PHPMYADMIN', true); /** * core functions */ -require_once './libraries/core.lib.php'; +require './libraries/core.lib.php'; /** * Input sanitizing */ -require_once './libraries/sanitizing.lib.php'; +require './libraries/sanitizing.lib.php'; /** * the PMA_Theme class */ -require_once './libraries/Theme.class.php'; +require './libraries/Theme.class.php'; /** * the PMA_Theme_Manager class */ -require_once './libraries/Theme_Manager.class.php'; +require './libraries/Theme_Manager.class.php'; /** * the PMA_Config class */ -require_once './libraries/Config.class.php'; +require './libraries/Config.class.php'; /** * the relation lib, tracker needs it */ -require_once './libraries/relation.lib.php'; +require './libraries/relation.lib.php'; /** * the PMA_Tracker class */ -require_once './libraries/Tracker.class.php'; +require './libraries/Tracker.class.php'; /** * the PMA_Table class */ -require_once './libraries/Table.class.php'; +require './libraries/Table.class.php'; if (!defined('PMA_MINIMUM_COMMON')) { /** @@ -334,7 +334,7 @@ if ($GLOBALS['PMA_Config']->get('ForceSSL') /** * include session handling after the globals, to prevent overwriting */ -require_once './libraries/session.inc.php'; +require './libraries/session.inc.php'; /** * init some variables LABEL_variables_init @@ -478,7 +478,7 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST[' /** * Require cleanup functions */ - require_once './libraries/cleanup.lib.php'; + require './libraries/cleanup.lib.php'; /** * Do actual cleanup */ diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 2f24e4f..c5b3ca4 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -237,8 +237,6 @@ function PMA_usort_comparison_callback($a, $b) function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = false, $link = null, $limit_offset = 0, $limit_count = false, $sort_by = 'Name', $sort_order = 'ASC') { - require_once './libraries/Table.class.php'; - if (true === $limit_count) { $limit_count = $GLOBALS['cfg']['MaxTableList']; } diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index 1110dc5..af75991 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -10,11 +10,6 @@ if (! defined('PHPMYADMIN')) { exit; } -/** - * - */ -require_once './libraries/Table.class.php'; - if (empty($is_db)) { if (strlen($db)) { $is_db = @PMA_DBI_select_db($db); diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 5f52d18..c795281 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -8,11 +8,6 @@ if (! defined('PHPMYADMIN')) { exit; } -/** - * - */ -require_once './libraries/Table.class.php'; - // Get relations & co. status $cfgRelation = PMA_getRelationsParam(); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index a435e3b..747c5b5 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -9,7 +9,6 @@ /** * */ -require_once './libraries/Table.class.php'; require_once './libraries/Index.class.php'; /** diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index cb8a23e..e6ebdc5 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -10,11 +10,6 @@ if (! defined('PHPMYADMIN')) { } /** - * - */ -require_once './libraries/Table.class.php'; - -/** * Executes a query as controluser if possible, otherwise as normal user * * @param string the query to execute diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index e97c2fb..00c9904 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -13,11 +13,6 @@ if (! defined('PHPMYADMIN')) { } /** - * - */ -require_once './libraries/Table.class.php'; - -/** * requirements */ require_once './libraries/common.inc.php'; diff --git a/sql.php b/sql.php index 28c6458..ed6f7d4 100644 --- a/sql.php +++ b/sql.php @@ -10,7 +10,6 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; require_once './libraries/check_user_privileges.lib.php'; require_once './libraries/bookmark.lib.php'; diff --git a/tbl_addfield.php b/tbl_addfield.php index e32ba30..ec910fd 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -9,7 +9,6 @@ * Get some core libraries */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; require_once './libraries/header.inc.php'; diff --git a/tbl_alter.php b/tbl_alter.php index d990f03..4c00acd 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -13,7 +13,6 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; require_once './libraries/header.inc.php'; diff --git a/tbl_create.php b/tbl_create.php index bffc934..4f6b56f 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -34,7 +34,6 @@ * Get some core libraries */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; $action = 'tbl_create.php'; diff --git a/tbl_move_copy.php b/tbl_move_copy.php index fa8a11e..9f0e229 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -9,7 +9,6 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; // Check parameters diff --git a/tbl_operations.php b/tbl_operations.php index 829ed13..493a17f 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -9,7 +9,6 @@ * */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; $pma_table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']); diff --git a/tbl_tracking.php b/tbl_tracking.php index 6ba7543..9b9dbcf 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -7,7 +7,6 @@ // Run common work require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; define('TABLE_MAY_BE_ABSENT', true); require './libraries/tbl_common.php'; diff --git a/view_operations.php b/view_operations.php index aabb7d1..2149e15 100644 --- a/view_operations.php +++ b/view_operations.php @@ -9,7 +9,6 @@ * */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; $pma_table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']); hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5941-gd291827

by Michal Čihař

The branch, master has been updated via d291827444206eeaf25399020ad6a3d98a5e2766 (commit) from ee767e2d3d10fff9f8bf1b9cc3bf448690dbcfa0 (commit) - Log ----------------------------------------------------------------- commit d291827444206eeaf25399020ad6a3d98a5e2766 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 16:20:24 2010 +0200 No need to require_once footer It is the last thing executed anyway (ends with exit). ----------------------------------------------------------------------- Summary of changes: chk_rel.php | 2 +- db_datadict.php | 2 +- db_export.php | 2 +- db_operations.php | 2 +- db_printview.php | 2 +- db_qbe.php | 4 ++-- db_search.php | 2 +- db_sql.php | 2 +- db_structure.php | 4 ++-- db_tracking.php | 4 ++-- export.php | 2 +- libraries/auth/config.auth.lib.php | 2 +- libraries/common.lib.php | 2 +- libraries/mult_submits.inc.php | 2 +- main.php | 2 +- pdf_pages.php | 10 +++++----- pdf_schema.php | 2 +- server_binlog.php | 2 +- server_collations.php | 2 +- server_databases.php | 2 +- server_engines.php | 2 +- server_export.php | 2 +- server_privileges.php | 6 +++--- server_processlist.php | 2 +- server_replication.php | 6 +++--- server_sql.php | 2 +- server_status.php | 2 +- server_synchronize.php | 2 +- server_variables.php | 2 +- sql.php | 4 ++-- tbl_addfield.php | 2 +- tbl_alter.php | 2 +- tbl_change.php | 4 ++-- tbl_create.php | 2 +- tbl_export.php | 2 +- tbl_import.php | 2 +- tbl_indexes.php | 2 +- tbl_operations.php | 2 +- tbl_printview.php | 2 +- tbl_relation.php | 2 +- tbl_row_action.php | 4 ++-- tbl_select.php | 2 +- tbl_sql.php | 2 +- tbl_structure.php | 2 +- tbl_tracking.php | 2 +- transformation_overview.php | 2 +- user_password.php | 6 +++--- view_create.php | 2 +- view_operations.php | 2 +- 49 files changed, 65 insertions(+), 65 deletions(-) diff --git a/chk_rel.php b/chk_rel.php index 0f965ac..8955350 100644 --- a/chk_rel.php +++ b/chk_rel.php @@ -21,5 +21,5 @@ $cfgRelation = PMA_getRelationsParam(TRUE); /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_datadict.php b/db_datadict.php index b200113..7666b56 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -320,5 +320,5 @@ function printPage() <?php echo '<br /><br /><input type="button" id="print" value="' . __('Print') . '" onclick="printPage()" />'; -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_export.php b/db_export.php index dce374a..a44469e 100644 --- a/db_export.php +++ b/db_export.php @@ -72,5 +72,5 @@ require_once './libraries/display_export.lib.php'; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_operations.php b/db_operations.php index f235de9..5d48440 100644 --- a/db_operations.php +++ b/db_operations.php @@ -501,5 +501,5 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?> /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_printview.php b/db_printview.php index 97f8a77..36f297c 100644 --- a/db_printview.php +++ b/db_printview.php @@ -264,5 +264,5 @@ function printPage() id="print" value="<?php echo __('Print'); ?>" onclick="printPage()" /> <?php -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_qbe.php b/db_qbe.php index 2156683..5599bad 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -98,7 +98,7 @@ $tbl_result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', $tbl_result_cnt = PMA_DBI_num_rows($tbl_result); if (0 == $tbl_result_cnt) { PMA_Message::error(__('No tables found in database.'))->display(); - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; exit; } @@ -939,5 +939,5 @@ if (!empty($qry_orderby)) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_search.php b/db_search.php index e57c161..0b68ba3 100644 --- a/db_search.php +++ b/db_search.php @@ -350,5 +350,5 @@ $alter_select = /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_sql.php b/db_sql.php index 27194b0..986fb34 100644 --- a/db_sql.php +++ b/db_sql.php @@ -41,5 +41,5 @@ PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? $_REQUEST['delimit /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_structure.php b/db_structure.php index 077dcab..899fa95 100644 --- a/db_structure.php +++ b/db_structure.php @@ -56,7 +56,7 @@ if ($num_tables == 0) { /** * Displays the footer */ - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; exit; } @@ -599,5 +599,5 @@ if (empty($db_is_information_schema)) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/db_tracking.php b/db_tracking.php index aa0d9e4..2ff54f0 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -35,7 +35,7 @@ if ($num_tables == 0 && count($data['ddlog']) == 0) { } // Display the footer - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; exit; } @@ -199,5 +199,5 @@ if (count($data['ddlog']) > 0) { /** * Display the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/export.php b/export.php index b1208bf..00639e2 100644 --- a/export.php +++ b/export.php @@ -667,6 +667,6 @@ else { //]]> </script> <?php - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } // end if ?> diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php index e16d189..3a9f82b 100644 --- a/libraries/auth/config.auth.lib.php +++ b/libraries/auth/config.auth.lib.php @@ -131,7 +131,7 @@ function PMA_auth_fails() echo '</tr>' . "\n"; } echo '</table>' . "\n"; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; return TRUE; } // end of the 'PMA_auth_fails()' function diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 86e49a9..c9a0f11 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -666,7 +666,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', * display footer and exit */ - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } else { echo $error_msg_output; } diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 2fab680..fe614e7 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -261,7 +261,7 @@ if (!empty($submit_mult) && !empty($what)) { <input type="submit" name="mult_btn" value="<?php echo __('No'); ?>" id="buttonNo" /> </fieldset> <?php - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } // end if diff --git a/main.php b/main.php index c09fd62..08faf49 100644 --- a/main.php +++ b/main.php @@ -390,5 +390,5 @@ function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = nu /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/pdf_pages.php b/pdf_pages.php index f026ca6..75d4622 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -38,24 +38,24 @@ $query_default_option = PMA_DBI_QUERY_STORE; if (!$cfgRelation['relwork']) { echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'relation', 'config.inc.php') . '<br />' . "\n" . PMA_showDocu('relation') . "\n"; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } if (!$cfgRelation['displaywork']) { echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'table_info', 'config.inc.php') . '<br />' . "\n" . PMA_showDocu('table_info') . "\n"; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } if (!isset($cfgRelation['table_coords'])){ echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'table_coords', 'config.inc.php') . '<br />' . "\n" . PMA_showDocu('table_coords') . "\n"; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } if (!isset($cfgRelation['pdf_pages'])) { echo sprintf(__('<b>%s</b> table not found or not set in %s'), 'pdf_page', 'config.inc.php') . '<br />' . "\n" . PMA_showDocu('pdf_pages') . "\n"; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } if ($cfgRelation['pdfwork']) { @@ -555,5 +555,5 @@ ToggleDragDrop('pdflayout'); * Displays the footer */ echo "\n"; -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/pdf_schema.php b/pdf_schema.php index 0142512..a1c16e6 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -239,7 +239,7 @@ class PMA_PDF extends TCPDF { . '">' . __('Back') . '</a>'; echo "\n"; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } // end of the "PMA_PDF_die()" function /** * Aliases the "Error()" function from the FPDF class to the diff --git a/server_binlog.php b/server_binlog.php index bfa4e07..60a5b57 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -234,6 +234,6 @@ while ($value = PMA_DBI_fetch_assoc($result)) { /** * Sends the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_collations.php b/server_collations.php index b6482cd..27fec06 100644 --- a/server_collations.php +++ b/server_collations.php @@ -95,6 +95,6 @@ unset($table_row_count); echo '</table>' . "\n" . '</div>' . "\n"; -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_databases.php b/server_databases.php index 16b2cdc..7aeee67 100644 --- a/server_databases.php +++ b/server_databases.php @@ -382,6 +382,6 @@ if ($cfg['ShowCreateDb']) { /** * Sends the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_engines.php b/server_engines.php index 5ef4e6f..7bdccc8 100644 --- a/server_engines.php +++ b/server_engines.php @@ -159,6 +159,6 @@ if (empty($_REQUEST['engine']) /** * Sends the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_export.php b/server_export.php index f9808d8..7b568fd 100644 --- a/server_export.php +++ b/server_export.php @@ -47,5 +47,5 @@ require_once './libraries/display_export.lib.php'; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_privileges.php b/server_privileges.php index 9577d77..cd5afe7 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -110,7 +110,7 @@ if (!$is_superuser) { . __('Privileges') . "\n" . '</h2>' . "\n"; PMA_Message::error(__('No Privileges'))->display(); - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } /** @@ -1679,7 +1679,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs if ($user_does_not_exists) { PMA_Message::warning(__('The selected user was not found in the privilege table.'))->display(); PMA_displayLoginInformationFields(); - //require_once './libraries/footer.inc.php'; + //require './libraries/footer.inc.php'; } echo '<form name="usersForm" id="usersForm" action="server_privileges.php" method="post">' . "\n"; @@ -2219,6 +2219,6 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs * Displays the footer */ echo "\n\n"; -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_processlist.php b/server_processlist.php index 58f4813..337d917 100644 --- a/server_processlist.php +++ b/server_processlist.php @@ -88,5 +88,5 @@ while($process = PMA_DBI_fetch_assoc($result)) { /** * Sends the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_replication.php b/server_replication.php index 9ac1816..6c410fa 100644 --- a/server_replication.php +++ b/server_replication.php @@ -31,7 +31,7 @@ if (! $is_superuser) { . __('Replication') . "\n" . '</h2>' . "\n"; PMA_Message::error(__('No Privileges'))->display(); - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } /** @@ -234,7 +234,7 @@ if (isset($GLOBALS['mr_configure'])) { echo ' </form>'; echo '</fieldset>'; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; exit; } @@ -358,5 +358,5 @@ if (! isset($GLOBALS['repl_clear_scr'])) { if (isset($GLOBALS['sl_configure'])) { PMA_replication_gui_changemaster("slave_changemaster"); } -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_sql.php b/server_sql.php index 73c1379..6a4fc68 100644 --- a/server_sql.php +++ b/server_sql.php @@ -31,5 +31,5 @@ PMA_sqlQueryForm(); /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_status.php b/server_status.php index 30edca2..bcbfe06 100644 --- a/server_status.php +++ b/server_status.php @@ -847,5 +847,5 @@ if ($server_master_status || $server_slave_status) /** * Sends the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_synchronize.php b/server_synchronize.php index 6f0941b..32a6cb5 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -1214,5 +1214,5 @@ if (isset($_REQUEST['synchronize_db'])) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/server_variables.php b/server_variables.php index db156a2..4616395 100644 --- a/server_variables.php +++ b/server_variables.php @@ -107,6 +107,6 @@ foreach ($serverVars as $name => $value) { /** * Sends the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/sql.php b/sql.php index 703cc29..28c6458 100644 --- a/sql.php +++ b/sql.php @@ -198,7 +198,7 @@ if ($do_confirm) { /** * Displays the footer and exit */ - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } // end if $do_confirm @@ -700,5 +700,5 @@ window.onload = function() /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_addfield.php b/tbl_addfield.php index 40b9ab2..e32ba30 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -224,7 +224,7 @@ if ($abort == false) { require_once './libraries/tbl_properties.inc.php'; // Diplays the footer - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } ?> diff --git a/tbl_alter.php b/tbl_alter.php index e4a12b5..d990f03 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -200,5 +200,5 @@ if ($abort == false) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_change.php b/tbl_change.php index 150e73b..8ec78f5 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -174,7 +174,7 @@ if (isset($where_clause)) { unset($rows[$key_id], $where_clause_array[$key_id]); PMA_showMessage(__('MySQL returned an empty result set (i.e. zero rows).'), $local_query); echo "\n"; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } else { // end if (no row returned) $meta = PMA_DBI_get_fields_meta($result[$key_id]); list($unique_condition, $tmp_clause_is_unique) = PMA_getUniqueCondition($result[$key_id], count($meta), $meta, $rows[$key_id], true); @@ -1111,5 +1111,5 @@ if ($insert_mode) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_create.php b/tbl_create.php index fc3fe65..bffc934 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -272,5 +272,5 @@ if (isset($_REQUEST['do_save_data'])) { */ require './libraries/tbl_properties.inc.php'; // Displays the footer -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_export.php b/tbl_export.php index eeaf248..959a95d 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -88,5 +88,5 @@ require_once './libraries/display_export.lib.php'; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_import.php b/tbl_import.php index ead8ff0..6fb74cd 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -28,6 +28,6 @@ require_once './libraries/display_import.lib.php'; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_indexes.php b/tbl_indexes.php index eb6deb9..166c6aa 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -261,5 +261,5 @@ echo '<input type="submit" name="add_fields" value="' . __('Go') . '"' /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_operations.php b/tbl_operations.php index 5e0e66b..829ed13 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -743,7 +743,7 @@ if ($cfgRelation['relwork'] && ! $is_innodb) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; function PMA_set_global_variables_for_engine($tbl_type) diff --git a/tbl_printview.php b/tbl_printview.php index 4fd966d..74b6818 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -496,5 +496,5 @@ function printPage() onclick="printPage()" /></p> <?php -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_relation.php b/tbl_relation.php index c057876..68288e1 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -569,5 +569,5 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_row_action.php b/tbl_row_action.php index 62fc204..8a9db7a 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -28,7 +28,7 @@ if (! PMA_isValid($_REQUEST['rows_to_delete'], 'array') $disp_message = __('No rows selected'); $disp_query = ''; require './sql.php'; - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } if (isset($_REQUEST['submit_mult'])) { @@ -148,7 +148,7 @@ if (!empty($submit_mult)) { /** * Displays the footer */ - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; break; } } diff --git a/tbl_select.php b/tbl_select.php index 31c25cb..d47baf7 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -324,7 +324,7 @@ $(function() { </fieldset> </form> <?php - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } diff --git a/tbl_sql.php b/tbl_sql.php index a9366c8..e72dce3 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -42,5 +42,5 @@ PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? $_REQUEST['delimit /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_structure.php b/tbl_structure.php index 82893ac..e78fd85 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -842,5 +842,5 @@ echo '<div class="clearfloat"></div>' . "\n"; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/tbl_tracking.php b/tbl_tracking.php index f7765b1..6ba7543 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -691,5 +691,5 @@ if ($last_version > 0) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/transformation_overview.php b/transformation_overview.php index acf2ca4..81211d5 100644 --- a/transformation_overview.php +++ b/transformation_overview.php @@ -77,5 +77,5 @@ foreach ($types['transformation'] as $key => $transform) { /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/user_password.php b/user_password.php index 89bc138..cd84b79 100644 --- a/user_password.php +++ b/user_password.php @@ -47,7 +47,7 @@ if (!$cfg['ShowChgPassword']) { if ($cfg['Server']['auth_type'] == 'config' || !$cfg['ShowChgPassword']) { require_once './libraries/header.inc.php'; PMA_Message::error(__('You don\'t have sufficient privileges to be here right now!'))->display(); - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } // end if @@ -109,7 +109,7 @@ if (isset($_REQUEST['nopass'])) { <a href="index.php<?php echo PMA_generate_common_url($_url_params); ?>" target="_parent"> <strong><?php echo __('Back'); ?></strong></a> <?php - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } // end if } // end if @@ -133,5 +133,5 @@ require_once './libraries/display_change_password.lib.php'; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/view_create.php b/view_create.php index a1de4cc..c7d63ce 100644 --- a/view_create.php +++ b/view_create.php @@ -186,6 +186,6 @@ $url_params['reload'] = 1; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> diff --git a/view_operations.php b/view_operations.php index 08c26d6..aabb7d1 100644 --- a/view_operations.php +++ b/view_operations.php @@ -106,5 +106,5 @@ $url_params['back'] = 'view_operations.php'; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5940-gee767e2

by Michal Čihař

The branch, master has been updated via ee767e2d3d10fff9f8bf1b9cc3bf448690dbcfa0 (commit) from bcc372b5c5118493d78818011ef0ec3a273b4821 (commit) - Log ----------------------------------------------------------------- commit ee767e2d3d10fff9f8bf1b9cc3bf448690dbcfa0 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 16:17:59 2010 +0200 No need to explicitely include relation.lib its anyway included in common.inc ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 1 - chk_rel.php | 1 - db_datadict.php | 4 ++-- db_operations.php | 1 - db_printview.php | 1 - db_qbe.php | 1 - db_tracking.php | 3 --- export.php | 1 - index.php | 5 ----- libraries/Table.class.php | 2 -- libraries/Tracker.class.php | 5 ----- libraries/bookmark.lib.php | 5 ----- libraries/db_links.inc.php | 1 - libraries/display_export.lib.php | 1 - libraries/footer.inc.php | 2 -- libraries/header.inc.php | 1 - libraries/import/docsql.php | 1 - libraries/relation_cleanup.lib.php | 5 ----- libraries/tbl_properties.inc.php | 1 - main.php | 1 - navigation.php | 3 +-- pdf_pages.php | 1 - pdf_schema.php | 1 - pmd_common.php | 1 - pmd_display_field.php | 1 - pmd_pdf.php | 2 -- pmd_relation_new.php | 1 - pmd_relation_upd.php | 1 - pmd_save_pos.php | 1 - querywindow.php | 3 +-- sql.php | 1 - tbl_addfield.php | 1 - tbl_alter.php | 1 - tbl_change.php | 5 ----- tbl_create.php | 1 - tbl_operations.php | 1 - tbl_printview.php | 1 - tbl_relation.php | 2 -- tbl_select.php | 1 - tbl_structure.php | 2 -- tbl_tracking.php | 3 --- transformation_wrapper.php | 1 - 42 files changed, 4 insertions(+), 74 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index 0f39cb4..4cfa543 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -22,7 +22,6 @@ require_once './libraries/header_http.inc.php'; * 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 index 323befd..0f965ac 100644 --- 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 index 6a9c04c..b200113 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -18,10 +18,10 @@ if (!isset($selected_tbl)) { /** * 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 index 7732131..f235de9 100644 --- a/db_operations.php +++ b/db_operations.php @@ -262,7 +262,6 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { * Settings for relations stuff */ -require_once './libraries/relation.lib.php'; $cfgRelation = PMA_getRelationsParam(); /** diff --git a/db_printview.php b/db_printview.php index 15801a9..97f8a77 100644 --- a/db_printview.php +++ b/db_printview.php @@ -26,7 +26,6 @@ $err_url = 'db_sql.php?' . PMA_generate_common_url($db); /** * Settings for relations stuff */ -require_once './libraries/relation.lib.php'; $cfgRelation = PMA_getRelationsParam(); /** diff --git a/db_qbe.php b/db_qbe.php index 7a08f07..2156683 100644 --- 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 index f18b9b8..aa0d9e4 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -17,9 +17,6 @@ $url_query .= '&goto=tbl_tracking.php&back=db_tracking.php'; $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 index 64ae7d3..b1208bf 100644 --- a/export.php +++ b/export.php @@ -383,7 +383,6 @@ $do_relation = isset($GLOBALS[$what . '_relation']); $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 index 3b16ec7..16e13d0 100644 --- 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 index 7839107..a29900e 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -781,7 +781,6 @@ class PMA_Table $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 @@ class PMA_Table * @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 index 82deb43..4f5c52f 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -6,11 +6,6 @@ */ /** - * 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 index fa6b4bf..dba279d 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -7,11 +7,6 @@ */ /** - * - */ -require_once './libraries/relation.lib.php'; - -/** * Defines the bookmark parameters for the current user * * @uses $GLOBALS['server'] diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php index a86bcf5..860d3d8 100644 --- a/libraries/db_links.inc.php +++ b/libraries/db_links.inc.php @@ -13,7 +13,6 @@ if (! defined('PHPMYADMIN')) { */ 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 index afa6435..5f52d18 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -14,7 +14,6 @@ if (! defined('PHPMYADMIN')) { 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 index b018549..ee76e91 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -49,8 +49,6 @@ if (! defined('PHPMYADMIN')) { /** * 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 index 9182f15..5638583 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -143,7 +143,6 @@ if (empty($GLOBALS['is_header_sent'])) { /** * 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 index 7f93f9b..7a5e1db 100644 --- a/libraries/import/docsql.php +++ b/libraries/import/docsql.php @@ -12,7 +12,6 @@ if (! defined('PHPMYADMIN')) { /** * 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 index 313e0b2..476d46c 100644 --- a/libraries/relation_cleanup.lib.php +++ b/libraries/relation_cleanup.lib.php @@ -10,11 +10,6 @@ if (! defined('PHPMYADMIN')) { } /** - * - */ -require_once './libraries/relation.lib.php'; - -/** * Cleanu column related relation stuff * * @uses PMA_getRelationsParam() diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 4b10f51..cc34157 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -117,7 +117,6 @@ if (!$is_backup) { $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 index ba6faa1..c09fd62 100644 --- a/main.php +++ b/main.php @@ -309,7 +309,6 @@ if (file_exists('./config')) { * 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 index 17cb587..cd9ca7d 100644 --- a/navigation.php +++ b/navigation.php @@ -110,9 +110,8 @@ if ($GLOBALS['server'] && ! strlen($GLOBALS['db'])) { $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 index a26420f..f026ca6 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -20,7 +20,6 @@ require_once './libraries/db_info.inc.php'; /** * 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 index 0979792..0142512 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -13,7 +13,6 @@ require_once './libraries/common.inc.php'; /** * 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 index bf23514..2cb2213 100644 --- a/pmd_common.php +++ b/pmd_common.php @@ -13,7 +13,6 @@ require_once './libraries/header_http.inc.php'; $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 index acfa162..21ef7f2 100644 --- 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 index 069f6f1..beec1e0 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -15,8 +15,6 @@ if (! isset($scale)) { 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 index 307304a..32d42ef 100644 --- 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 index a4ee7f9..f05ffbd 100644 --- 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 index 7f6179a..cea1001 100644 --- 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 index 84b0e82..86af6c0 100644 --- a/querywindow.php +++ b/querywindow.php @@ -50,9 +50,8 @@ require_once './libraries/ob.lib.php'; PMA_outBufferPre(); /** - * load relations + * load relation params */ -require_once './libraries/relation.lib.php'; $cfgRelation = PMA_getRelationsParam(); /** diff --git a/sql.php b/sql.php index 9175532..703cc29 100644 --- a/sql.php +++ b/sql.php @@ -585,7 +585,6 @@ else { } if (strlen($db)) { - require_once './libraries/relation.lib.php'; $cfgRelation = PMA_getRelationsParam(); } diff --git a/tbl_addfield.php b/tbl_addfield.php index 6d6c14a..40b9ab2 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -164,7 +164,6 @@ if (isset($_REQUEST['do_save_data'])) { 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 index 423156e..e4a12b5 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -105,7 +105,6 @@ if (isset($_REQUEST['do_save_data'])) { /** * 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 index 704cdc1..150e73b 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -45,11 +45,6 @@ if (isset($_REQUEST['ShowFieldTypesInDataEditView'])) { } /** - * load relation data, foreign keys - */ -require_once './libraries/relation.lib.php'; - -/** * file listing */ require_once './libraries/file_listing.php'; diff --git a/tbl_create.php b/tbl_create.php index fc1119b..fc3fe65 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -223,7 +223,6 @@ if (isset($_REQUEST['do_save_data'])) { 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 index fa89491..5e0e66b 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -23,7 +23,6 @@ $url_params['goto'] = $url_params['back'] = 'tbl_operations.php'; /** * Gets relation settings */ -require_once './libraries/relation.lib.php'; $cfgRelation = PMA_getRelationsParam(); /** diff --git a/tbl_printview.php b/tbl_printview.php index 1b625f9..4fd966d 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -29,7 +29,6 @@ if (! isset($the_tables) || ! is_array($the_tables)) { /** * 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 index ab58511..c057876 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -38,8 +38,6 @@ $avoid_show_comment = TRUE; */ 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 index d9e8a46..31c25cb 100644 --- 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 index b0263a3..82893ac 100644 --- 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 @@ $comments_map = array(); $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 index 6312262..f7765b1 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -15,9 +15,6 @@ $url_query .= '&goto=tbl_tracking.php&back=tbl_tracking.php'; $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 index 3dd9c31..3699dd0 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -14,7 +14,6 @@ define('IS_TRANSFORMATION_WRAPPER', true); * 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(); hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5939-gbcc372b

by Michal Čihař

The branch, master has been updated via bcc372b5c5118493d78818011ef0ec3a273b4821 (commit) via 049fc7fef7548c2ba603196937c6dcaf9ff9bf00 (commit) via 83d458aa05286397198bcd0674eeeb610849ef5a (commit) from 15dfc4879ec8f8273bdec711597e118bd938653c (commit) - Log ----------------------------------------------------------------- commit bcc372b5c5118493d78818011ef0ec3a273b4821 Merge: 15dfc4879ec8f8273bdec711597e118bd938653c 049fc7fef7548c2ba603196937c6dcaf9ff9bf00 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 15:51:48 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 ++- libraries/common.lib.php | 3 ++- libraries/dbi/mysqli.dbi.lib.php | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dfdf92f..3adda53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,8 +97,9 @@ $Id$ - [interface] Better formatting for SQL validator results. 3.3.6.0 (not yet released) -- bug #3031705 [core] Do not use CONCAT for DECIMAL fields. - bug #3033063 [core] Navi gets wrong db name +- bug #3031705 [core] Fix generating condition for real numbers by comparing + them to string. 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 1010b2c..86e49a9 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2105,7 +2105,8 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force $condition .= 'IS NULL AND'; } else { // timestamp is numeric on some MySQL 4.1 - if ($meta->numeric && $meta->type != 'timestamp') { + // for real we use CONCAT above and it should compare to string + if ($meta->numeric && $meta->type != 'timestamp' && $meta->type != 'real') { $condition .= '= ' . $row[$i] . ' AND'; } elseif (($meta->type == 'blob' || $meta->type == 'string') // hexify only if this is a true not empty BLOB or a BINARY diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index de90cac..ad6d545 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -488,8 +488,8 @@ function PMA_DBI_get_fields_meta($result) { // Build an associative array for a type look up $typeAr = array(); - $typeAr[MYSQLI_TYPE_DECIMAL] = 'decimal'; - $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'decimal'; + $typeAr[MYSQLI_TYPE_DECIMAL] = 'real'; + $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'real'; $typeAr[MYSQLI_TYPE_BIT] = 'int'; $typeAr[MYSQLI_TYPE_TINY] = 'int'; $typeAr[MYSQLI_TYPE_SHORT] = 'int'; hooks/post-receive -- phpMyAdmin

14 years, 1 month

← Newer
1
2
3
4
5
6
7
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git July 2010