- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5326-gd4f6b5c
by Marc Delisle 07 Jul '10

07 Jul '10

The branch, master has been updated via d4f6b5c4ba7932c7ada66080d2a5351cc046447c (commit) via 8a153086a17cbc97423290b4fe7cfdf6f75e64a1 (commit) from bd09ef50ff5b498e9cfc1be0b8987ae0fb3ce58d (commit) - Log ----------------------------------------------------------------- commit d4f6b5c4ba7932c7ada66080d2a5351cc046447c Merge: bd09ef50ff5b498e9cfc1be0b8987ae0fb3ce58d 8a153086a17cbc97423290b4fe7cfdf6f75e64a1 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jul 7 06:13:38 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: libraries/config.default.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index 7b24d87..cd6ef6b 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -587,11 +587,12 @@ $cfg['Confirm'] = true; $cfg['LoginCookieRecall'] = true; /** - * validity of cookie login (in seconds; 1800 seconds is 30 minutes) + * validity of cookie login (in seconds; 1440 matches php.ini's + * session.gc_maxlifetime) * * @global integer $cfg['LoginCookieValidity'] */ -$cfg['LoginCookieValidity'] = 1800; +$cfg['LoginCookieValidity'] = 1440; /** * how long login cookie should be stored (in seconds) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-17-g8a15308
by Marc Delisle 07 Jul '10

07 Jul '10

The branch, QA_3_3 has been updated via 8a153086a17cbc97423290b4fe7cfdf6f75e64a1 (commit) from 9903c5f3d0b4fe9bdc44f7f9ff37e110114e678a (commit) - Log ----------------------------------------------------------------- commit 8a153086a17cbc97423290b4fe7cfdf6f75e64a1 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jul 7 06:13:06 2010 -0400 revert to previous value and add a comment in default configuration file ----------------------------------------------------------------------- Summary of changes: libraries/config.default.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index eea22aa..1f2e35b 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -580,11 +580,12 @@ $cfg['Confirm'] = true; $cfg['LoginCookieRecall'] = true; /** - * validity of cookie login (in seconds; 1800 seconds is 30 minutes) + * validity of cookie login (in seconds; 1440 matches php.ini's + * session.gc_maxlifetime) * * @global integer $cfg['LoginCookieValidity'] */ -$cfg['LoginCookieValidity'] = 1800; +$cfg['LoginCookieValidity'] = 1440; /** * how long login cookie should be stored (in seconds) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5324-gbd09ef5
by Marc Delisle 06 Jul '10

06 Jul '10

The branch, master has been updated via bd09ef50ff5b498e9cfc1be0b8987ae0fb3ce58d (commit) via 9903c5f3d0b4fe9bdc44f7f9ff37e110114e678a (commit) from 573edc0329f779dac9ad68dcd8f20ef304f885e5 (commit) - Log ----------------------------------------------------------------- commit bd09ef50ff5b498e9cfc1be0b8987ae0fb3ce58d Merge: 573edc0329f779dac9ad68dcd8f20ef304f885e5 9903c5f3d0b4fe9bdc44f7f9ff37e110114e678a Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jul 6 16:58:50 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/config.default.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35c86f5..61d2c52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ $Id$ - bug [replication] Do not offer information_schema in the list of databases - bug [js] Avoid loading twice a js file - bug #3024344 [setup] Setup forces numeric MemoryLimit +- bug #3025975 [auth] Odd LoginCookieValidity default value 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/config.default.php b/libraries/config.default.php index be034c8..7b24d87 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -587,11 +587,11 @@ $cfg['Confirm'] = true; $cfg['LoginCookieRecall'] = true; /** - * validity of cookie login (in seconds) + * validity of cookie login (in seconds; 1800 seconds is 30 minutes) * * @global integer $cfg['LoginCookieValidity'] */ -$cfg['LoginCookieValidity'] = 1440; +$cfg['LoginCookieValidity'] = 1800; /** * how long login cookie should be stored (in seconds) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-16-g9903c5f
by Marc Delisle 06 Jul '10

06 Jul '10

The branch, QA_3_3 has been updated via 9903c5f3d0b4fe9bdc44f7f9ff37e110114e678a (commit) from 43e41e0654c6d85e9311796631fddbf15f568cd3 (commit) - Log ----------------------------------------------------------------- commit 9903c5f3d0b4fe9bdc44f7f9ff37e110114e678a Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jul 6 16:58:13 2010 -0400 bug #3025975 [auth] Odd LoginCookieValidity default value ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/config.default.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c019b0..9da63ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [replication] Do not offer information_schema in the list of databases - bug [js] Avoid loading twice a js file - bug #3024344 [setup] Setup forces numeric MemoryLimit +- bug #3025975 [auth] Odd LoginCookieValidity default value 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/config.default.php b/libraries/config.default.php index de03aa2..eea22aa 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -580,11 +580,11 @@ $cfg['Confirm'] = true; $cfg['LoginCookieRecall'] = true; /** - * validity of cookie login (in seconds) + * validity of cookie login (in seconds; 1800 seconds is 30 minutes) * * @global integer $cfg['LoginCookieValidity'] */ -$cfg['LoginCookieValidity'] = 1440; +$cfg['LoginCookieValidity'] = 1800; /** * how long login cookie should be stored (in seconds) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5322-g573edc0
by Marc Delisle 06 Jul '10

06 Jul '10

The branch, master has been updated via 573edc0329f779dac9ad68dcd8f20ef304f885e5 (commit) from 11609bdf80370732b66ba99edecb9febd5d16beb (commit) - Log ----------------------------------------------------------------- commit 573edc0329f779dac9ad68dcd8f20ef304f885e5 Author: Piotr Przybylski <crackpl(a)users.sourceforge.net> Date: Tue Jul 6 11:43:02 2010 -0400 patch #3025161 [core] Prevent sending of unnecessary cookies ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/Config.class.php | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf99259..35c86f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,8 @@ $Id$ - bug #3004216 [CSS] Field attributes use inline CSS - patch #2999595, rfe #2998130 [interface] Cleanup navigation frame. - [core] Update library PHPExcel to version 1.7.3c +- patch #3025161 [core] Prevent sending of unnecessary cookies, + thanks to Piotr Przybylski - crackpl 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/libraries/Config.class.php b/libraries/Config.class.php index c0090aa..28994c2 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -1086,10 +1086,13 @@ class PMA_Config if ($validity == null) { $validity = 2592000; } - if (strlen($value) && null !== $default && $value === $default - && isset($_COOKIE[$cookie])) { - // remove cookie, default value is used - return $this->removeCookie($cookie); + if (strlen($value) && null !== $default && $value === $default) { + // default value is used + if (isset($_COOKIE[$cookie])) { + // remove cookie + return $this->removeCookie($cookie); + } + return false; } if (! strlen($value) && isset($_COOKIE[$cookie])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5321-g11609bd
by Marc Delisle 06 Jul '10

06 Jul '10

The branch, master has been updated via 11609bdf80370732b66ba99edecb9febd5d16beb (commit) from 3e9e18aebb5d551f260e178f2f311384c2653b28 (commit) - Log ----------------------------------------------------------------- commit 11609bdf80370732b66ba99edecb9febd5d16beb Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jul 6 11:15:46 2010 -0400 must specify dateFormat for jQuery UI datepicker, otherwise a wrong MM/DD/YYYY is passed to MySQL ----------------------------------------------------------------------- Summary of changes: tbl_change.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tbl_change.php b/tbl_change.php index 051b1fc..61ccadc 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -1080,6 +1080,7 @@ foreach ($rows as $row_id => $vrow) { if ($field['pma_type'] == 'date' || $field['pma_type'] == 'datetime' || substr($field['pma_type'], 0, 9) == 'timestamp') { // the _3 suffix points to the date field // the _2 suffix points to the corresponding NULL checkbox + // in dateFormat, 'yy' means the year with 4 digits ?> <script type="text/javascript"> //<![CDATA[ @@ -1090,6 +1091,7 @@ $(function() { stepMinutes: 1, stepHours: 1, <?php echo ($field['pma_type'] == 'date' ? "showTime: false,":"showTime: true,"); ?> + dateFormat: 'yy-mm-dd', altTimeField: '', constrainInput: false }); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5319-g9e857f9
by Marc Delisle 02 Jul '10

02 Jul '10

The branch, master has been updated via 9e857f9f84591eedf3be50668356411eb52da0fa (commit) via 43e41e0654c6d85e9311796631fddbf15f568cd3 (commit) via 6ea94679499b0e48f6801d0b06c381556f2712c3 (commit) from dbd813095aafb206659d1da93a30d3531fb4daf7 (commit) - Log ----------------------------------------------------------------- commit 9e857f9f84591eedf3be50668356411eb52da0fa Merge: dbd813095aafb206659d1da93a30d3531fb4daf7 43e41e0654c6d85e9311796631fddbf15f568cd3 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 2 12:32:00 2010 -0400 fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + Documentation.html | 2 +- libraries/config.default.php | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12e1d24..bf99259 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ $Id$ 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 +- bug #3024344 [setup] Setup forces numeric MemoryLimit 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/Documentation.html b/Documentation.html index d414b47..7e945db 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1315,7 +1315,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <dd>Path for storing session data (<a href="http://php.net/session_save_path">session_save_path PHP parameter</a>).</dd> - <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] integer [number of bytes]</dt> + <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] string [number of bytes]</dt> <dd>Set the number of bytes a script is allowed to allocate. If set to zero, no limit is imposed.<br /> This setting is used while importing/exporting dump files and at some diff --git a/libraries/config.default.php b/libraries/config.default.php index b2a3932..be034c8 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -542,11 +542,13 @@ $cfg['ExecTimeLimit'] = 300; $cfg['SessionSavePath'] = ''; /** - * maximum allocated bytes (0 for no limit) + * maximum allocated bytes ('0' for no limit) + * this is a string because '16M' is a valid value; we must put here + * a string as the default value so that /setup accepts strings * - * @global integer $cfg['MemoryLimit'] + * @global string $cfg['MemoryLimit'] */ -$cfg['MemoryLimit'] = 0; +$cfg['MemoryLimit'] = '0'; /** * mark used tables, make possible to show locked tables (since MySQL 3.23.30) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-15-g43e41e0
by Marc Delisle 02 Jul '10

02 Jul '10

The branch, QA_3_3 has been updated via 43e41e0654c6d85e9311796631fddbf15f568cd3 (commit) from 6ea94679499b0e48f6801d0b06c381556f2712c3 (commit) - Log ----------------------------------------------------------------- commit 43e41e0654c6d85e9311796631fddbf15f568cd3 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 2 12:28:44 2010 -0400 document MemoryLimit as being a string value ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index b930104..1afb497 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1300,7 +1300,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> This setting is used while importing/exporting dump files and in the Synchronize feature but has no effect when PHP is running in safe mode.</dd> - <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] integer [number of bytes]</dt> + <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] string [number of bytes]</dt> <dd>Set the number of bytes a script is allowed to allocate. If set to zero, no limit is imposed.<br /> This setting is used while importing/exporting dump files and at some hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-14-g6ea9467
by Marc Delisle 02 Jul '10

02 Jul '10

The branch, QA_3_3 has been updated via 6ea94679499b0e48f6801d0b06c381556f2712c3 (commit) from 1db012abc83f194b8423eca63a81a6715516dc30 (commit) - Log ----------------------------------------------------------------- commit 6ea94679499b0e48f6801d0b06c381556f2712c3 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 2 12:26:54 2010 -0400 bug #3024344 [setup] Setup forces numeric MemoryLimit ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/config.default.php | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index eaa81ec..7c019b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 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 +- bug #3024344 [setup] Setup forces numeric MemoryLimit 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/config.default.php b/libraries/config.default.php index b1fef17..de03aa2 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -536,11 +536,13 @@ $cfg['ForceSSL'] = false; $cfg['ExecTimeLimit'] = 300; /** - * maximum allocated bytes (0 for no limit) + * maximum allocated bytes ('0' for no limit) + * this is a string because '16M' is a valid value; we must put here + * a string as the default value so that /setup accepts strings * - * @global integer $cfg['MemoryLimit'] + * @global string $cfg['MemoryLimit'] */ -$cfg['MemoryLimit'] = 0; +$cfg['MemoryLimit'] = '0'; /** * mark used tables, make possible to show locked tables (since MySQL 3.23.30) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5316-gdbd8130
by Marc Delisle 02 Jul '10

02 Jul '10

The branch, master has been updated via dbd813095aafb206659d1da93a30d3531fb4daf7 (commit) via 1db012abc83f194b8423eca63a81a6715516dc30 (commit) from 7d4c3174f7e28a17fbacab91b67eb7cc1ff4ed0a (commit) - Log ----------------------------------------------------------------- commit dbd813095aafb206659d1da93a30d3531fb4daf7 Merge: 7d4c3174f7e28a17fbacab91b67eb7cc1ff4ed0a 1db012abc83f194b8423eca63a81a6715516dc30 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 2 11:23:11 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: js/common.js | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/js/common.js b/js/common.js index 1d52c97..8ba7bcd 100644 --- a/js/common.js +++ b/js/common.js @@ -101,10 +101,13 @@ function setDb(new_db) { var old_db = db; db = new_db; + // the db name as an id exists only when LeftFrameLight is false if (window.frame_navigation.document.getElementById(db) == null) { + // happens when LeftFrameLight is true // db is unknown, reload complete left frame refreshNavigation(); } else { + // happens when LeftFrameLight is false unmarkDbTable(old_db); markDbTable(db); } hooks/post-receive -- phpMyAdmin

1 0