The branch, master has been updated
via 01d6fed4e2c9594a36d6e688ea26d66946c7b080 (commit)
via 108f3305e9b1e5950c8bf7bd49d0f41bec2c1154 (commit)
from 63b6abb326a5795850e9dfeb469873db38bc92a4 (commit)
- Log -----------------------------------------------------------------
commit 01d6fed4e2c9594a36d6e688ea26d66946c7b080
Merge: 63b6abb326a5795850e9dfeb469873db38bc92a4 108f3305e9b1e5950c8bf7bd49d0f41bec2c1154
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jun 30 11:37:53 2010 -0400
fix merge conflicts
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/header_scripts.inc.php | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f8f0df5..12e1d24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -91,6 +91,7 @@ $Id$
- bug #3022705 [import] Import button does not work in Catalan when there
is no progress bar possible
- bug [replication] Do not offer information_schema in the list of databases
+- bug [js] Avoid loading twice a js file
3.3.4.0 (2010-06-28)
- bug #2996161 [import] properly escape import value
diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
index 6a4aacb..cb366b5 100644
--- a/libraries/header_scripts.inc.php
+++ b/libraries/header_scripts.inc.php
@@ -66,6 +66,9 @@ $GLOBALS['js_events'][] = array(
* upgrade phpMyAdmin are not stuck with older .js files in their
* browser cache. This produces an HTTP 304 request for each file.
*/
+
+// avoid loading twice a js file
+$GLOBALS['js_include'] = array_unique($GLOBALS['js_include']);
foreach ($GLOBALS['js_include'] as $js_script_file) {
if (strpos($js_script_file, '?') === FALSE) {
echo '<script src="./js/' . $js_script_file . '?ts=' . filemtime('./js/' . $js_script_file) . '" type="text/javascript"></script>' . "\n";
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 63b6abb326a5795850e9dfeb469873db38bc92a4 (commit)
via b2fdf039db1ec34aea802b722bf5ce51b12c1f0b (commit)
from 0f9dfaca8605b9aa1f01bee92ada6d482d3f2886 (commit)
- Log -----------------------------------------------------------------
commit 63b6abb326a5795850e9dfeb469873db38bc92a4
Merge: 0f9dfaca8605b9aa1f01bee92ada6d482d3f2886 b2fdf039db1ec34aea802b722bf5ce51b12c1f0b
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jun 30 09:36:11 2010 -0400
Merge branch 'QA_3_3'
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 460915a..3c12424 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -946,7 +946,8 @@ since this link provides funding for phpMyAdmin.
table. To allow the usage of this functionality:
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li>
<li>put the table name in
- <tt>$cfg['Servers'][$i]['table_info']</tt></li>
+ <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g.
+ 'pma_table_info')</li>
<li>then for each table where you want to use this feature,
click "Structure/Relation view/Choose column to display"
to choose the column.</li>
@@ -1005,7 +1006,8 @@ since this link provides funding for phpMyAdmin.
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables
infrastructure</li>
<li>put the table name in
- <tt>$cfg['Servers'][$i]['column_info']</tt></li>
+ <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g.
+ 'pma_column_info')</li>
<li>to update your PRE-2.5.0 Column_comments Table use this:
<pre>
@@ -1045,6 +1047,7 @@ ALTER TABLE `pma_column_comments`
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables
infrastructure</li>
<li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt>
+ (e.g. 'pma_history')
</li>
</ul>
</dd>
@@ -1075,7 +1078,7 @@ ALTER TABLE `pma_column_comments`
<ul>
<li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li>
- <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt></li>
+ <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. 'pma_tracking')</li>
</ul>
</dd>
@@ -1147,7 +1150,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables
infrastructure</li>
- <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt>
+ <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. 'pma_designer_coords')
</li>
</ul>
</dd>
hooks/post-receive
--
phpMyAdmin
The branch, QA_3_3 has been updated
via b2fdf039db1ec34aea802b722bf5ce51b12c1f0b (commit)
from 852ed51c27f35ec942440e0330318775d8e4c91d (commit)
- Log -----------------------------------------------------------------
commit b2fdf039db1ec34aea802b722bf5ce51b12c1f0b
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jun 30 09:35:44 2010 -0400
clarify what is meant by "put the table name"
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 6dff5d4..bd086d7 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -935,7 +935,8 @@ since this link provides funding for phpMyAdmin.
table. To allow the usage of this functionality:
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li>
<li>put the table name in
- <tt>$cfg['Servers'][$i]['table_info']</tt></li>
+ <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g.
+ 'pma_table_info')</li>
<li>then for each table where you want to use this feature,
click "Structure/Relation view/Choose field to display"
to choose the field.</li>
@@ -994,7 +995,8 @@ since this link provides funding for phpMyAdmin.
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables
infrastructure</li>
<li>put the table name in
- <tt>$cfg['Servers'][$i]['column_info']</tt></li>
+ <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g.
+ 'pma_column_info')</li>
<li>to update your PRE-2.5.0 Column_comments Table use this:
<pre>
@@ -1034,6 +1036,7 @@ ALTER TABLE `pma_column_comments`
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables
infrastructure</li>
<li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt>
+ (e.g. 'pma_history')
</li>
</ul>
</dd>
@@ -1064,7 +1067,7 @@ ALTER TABLE `pma_column_comments`
<ul>
<li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li>
- <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt></li>
+ <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. 'pma_tracking')</li>
</ul>
</dd>
@@ -1136,7 +1139,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables
infrastructure</li>
- <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt>
+ <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. 'pma_designer_coords')
</li>
</ul>
</dd>
hooks/post-receive
--
phpMyAdmin
The branch, QA_3_3 has been updated
via 852ed51c27f35ec942440e0330318775d8e4c91d (commit)
from f463b1cc7a87e8a7e69ee67d942cae34f4ac37ff (commit)
- Log -----------------------------------------------------------------
commit 852ed51c27f35ec942440e0330318775d8e4c91d
Author: Marc Delisle <marc(a)infomarc.info>
Date: Tue Jun 29 08:14:31 2010 -0400
bug [replication] Do not offer information_schema in the list of databases
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/replication_gui.lib.php | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7cdba96..66873fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
databases, thanks to Stéphane Pontier - shadow_walker
- bug #3022705 [import] Import button does not work in Catalan when there
is no progress bar possible
+- bug [replication] Do not offer information_schema in the list of databases
3.3.4.0 (2010-06-28)
- bug #2996161 [import] properly escape import value
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index d772800..b5f14ad 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -72,6 +72,9 @@ function PMA_replication_db_multibox()
$multi_values .= '<select name="db_select[]" size="6" multiple="multiple" id="db_select">';
foreach ($GLOBALS['pma']->databases as $current_db) {
+ if ('information_schema' == $current_db) {
+ continue;
+ }
if (! empty($selectall) || (isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))) {
$is_selected = ' selected="selected"';
} else {
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 90ac3d39a03235593b0952864bfd1e14139cc37c (commit)
from 16ed06531a00ebac5bd33b40fbdb8139639f726c (commit)
- Log -----------------------------------------------------------------
commit 90ac3d39a03235593b0952864bfd1e14139cc37c
Author: Marc Delisle <marc(a)infomarc.info>
Date: Tue Jun 29 07:56:10 2010 -0400
bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 ++
libraries/display_import.lib.php | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7492e73..7772727 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,6 +88,8 @@ $Id$
3.3.5.0 (not yet released)
- 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
+ is no progress bar possible
3.3.4.0 (2010-06-28)
- bug #2996161 [import] properly escape import value
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 923d962..318dd34 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -96,7 +96,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
<?php
} else { // no plugin avaliable
?>
- $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo __('Please be patient, the file is being uploaded. Details about the upload are not available.') . PMA_showDocu('faq2_9'); ?>');
+ $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.')) . PMA_showDocu('faq2_9'); ?>');
$('#upload_form_status').css("display", "none");
<?php
} // else
hooks/post-receive
--
phpMyAdmin