Git

git@phpmyadmin.net

8 participants
38200 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_3_5-8-gb404588
by Marc Delisle 26 Jul '10

26 Jul '10

The branch, TESTING has been updated via b40458875721cefa2ee16241e7a657463452999d (commit) via f3f073a0ba8fe8e3857d98a84627bda53d50dc5e (commit) via 58021a8e6c5c9fe7963864480c365f8f49f390b4 (commit) from 15ba6003dcfa87bacc7100c7e0409ef1d525ce68 (commit) - Log ----------------------------------------------------------------- commit b40458875721cefa2ee16241e7a657463452999d Merge: 15ba6003dcfa87bacc7100c7e0409ef1d525ce68 f3f073a0ba8fe8e3857d98a84627bda53d50dc5e Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 26 12:31:37 2010 -0400 Merge branch 'MAINT_3_3_5' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 ++- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- scripts/create_tables.sql | 2 +- translators.html | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b0c93f..53adf96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ -3.3.5.0 (not yet released) +3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there @@ -20,6 +20,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [export] CSV for MS Excel (Windows) should have semi-colon as separator - [core] Update library PHPExcel to version 1.7.3c - bug #2994885, bug #3029168 [import] Convert Excel column name correctly +- bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/Documentation.html b/Documentation.html index 9053c48..100b9ae 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.5-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.5 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.5-rc1 + 3.3.5 Documentation </h1> </div> diff --git a/README b/README index 18a6bef..279f66f 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.5-rc1 - ----------------- + Version 3.3.5 + ------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 4931858..e73de8b 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.5-rc1'); + $this->set('PMA_VERSION', '3.3.5'); /** * @deprecated */ diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index bcb8b35..e4d0fc8 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -80,7 +80,7 @@ CREATE TABLE IF NOT EXISTS `pma_history` ( `username` varchar(64) NOT NULL default '', `db` varchar(64) NOT NULL default '', `table` varchar(64) NOT NULL default '', - `timevalue` timestamp(14) NOT NULL, + `timevalue` timestamp NOT NULL, `sqlquery` text NOT NULL, PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) diff --git a/translators.html b/translators.html index 407c759..d847a9e 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.5-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.5 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.5-rc1 + 3.3.5 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_3_5, created. RELEASE_3_3_5
by Marc Delisle 26 Jul '10

26 Jul '10

The annotated tag, RELEASE_3_3_5 has been created at bf316ac3fc17da76822d65758fe315af89c9a633 (tag) tagging f3f073a0ba8fe8e3857d98a84627bda53d50dc5e (commit) replaces RELEASE_3_3_5RC1 tagged by Marc Delisle on Mon Jul 26 12:31:36 2010 -0400 - Log ----------------------------------------------------------------- Released 3.3.5 Marc Delisle (2): bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql 3.3.5 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5RC1-11-g4317af2
by Michal Čihař 26 Jul '10

26 Jul '10

The branch, QA_3_3 has been updated via 4317af25ef788f0aae1a498e1ce8b9d708f347ac (commit) via f3f073a0ba8fe8e3857d98a84627bda53d50dc5e (commit) from e43fe5a8f100c772602aae71da9c529a542db493 (commit) - Log ----------------------------------------------------------------- commit 4317af25ef788f0aae1a498e1ce8b9d708f347ac Merge: e43fe5a8f100c772602aae71da9c529a542db493 f3f073a0ba8fe8e3857d98a84627bda53d50dc5e Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 18:29:37 2010 +0200 Merge branch 'MAINT_3_3_5' into QA_3_3 ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5961-g41bc587
by Marc Delisle 26 Jul '10

26 Jul '10

The branch, master has been updated via 41bc587ed4494d21e7b69647a1235d2ca405c8ea (commit) via e43fe5a8f100c772602aae71da9c529a542db493 (commit) from 6c3ad9e942c446abb4473b173bedf6e3d26c8ce2 (commit) - Log ----------------------------------------------------------------- commit 41bc587ed4494d21e7b69647a1235d2ca405c8ea Merge: 6c3ad9e942c446abb4473b173bedf6e3d26c8ce2 e43fe5a8f100c772602aae71da9c529a542db493 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 26 12:29:48 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b75e9c8..6fd14f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,7 +103,7 @@ $Id$ - bug #3031705 [core] Fix generating condition for real numbers by comparing them to string. -3.3.5.0 (not yet released) +3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5RC1-9-ge43fe5a
by Marc Delisle 26 Jul '10

26 Jul '10

The branch, QA_3_3 has been updated via e43fe5a8f100c772602aae71da9c529a542db493 (commit) from 049fc7fef7548c2ba603196937c6dcaf9ff9bf00 (commit) - Log ----------------------------------------------------------------- commit e43fe5a8f100c772602aae71da9c529a542db493 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 26 12:27:30 2010 -0400 3.3.5 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 748e243..455c390 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3031705 [core] Fix generating condition for real numbers by comparing them to string. -3.3.5.0 (not yet released) +3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_5, updated. RELEASE_3_3_5RC1-2-gf3f073a
by Marc Delisle 26 Jul '10

26 Jul '10

The branch, MAINT_3_3_5 has been updated via f3f073a0ba8fe8e3857d98a84627bda53d50dc5e (commit) from 58021a8e6c5c9fe7963864480c365f8f49f390b4 (commit) - Log ----------------------------------------------------------------- commit f3f073a0ba8fe8e3857d98a84627bda53d50dc5e Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 26 12:26:41 2010 -0400 3.3.5 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 555c6f2..53adf96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ -3.3.5.0 (not yet released) +3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there diff --git a/Documentation.html b/Documentation.html index 9053c48..100b9ae 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.5-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.5 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.5-rc1 + 3.3.5 Documentation </h1> </div> diff --git a/README b/README index 18a6bef..279f66f 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.5-rc1 - ----------------- + Version 3.3.5 + ------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 4931858..e73de8b 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.5-rc1'); + $this->set('PMA_VERSION', '3.3.5'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 407c759..d847a9e 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.5-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.5 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.5-rc1 + 3.3.5 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5959-g6c3ad9e
by Michal Čihař 26 Jul '10

26 Jul '10

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

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5957-g0933b71
by Michal Čihař 26 Jul '10

26 Jul '10

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

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5954-gcfc7fd7
by Michal Čihař 26 Jul '10

26 Jul '10

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

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5953-g639dc7f
by Michal Čihař 26 Jul '10

26 Jul '10

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

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git