- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6129-gfd65dcd
by Marc Delisle 05 Aug '10

05 Aug '10

The branch, master has been updated via fd65dcdcd147d9a866025c6894b3b994014f63eb (commit) via d42dab9dd48e337f9b4e8f59f16e04db908ce5e8 (commit) via 158517d7644b83459dc67210e66c0c8b96c3d4cd (commit) from d46bb6d87767ae7e9da1e4182f95ba1d885e26e9 (commit) - Log ----------------------------------------------------------------- commit fd65dcdcd147d9a866025c6894b3b994014f63eb Merge: d46bb6d87767ae7e9da1e4182f95ba1d885e26e9 d42dab9dd48e337f9b4e8f59f16e04db908ce5e8 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Aug 5 13:00:24 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/dbi/mysqli.dbi.lib.php | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4242ca5..43dc0d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -111,6 +111,8 @@ $Id$ them to string. - bug #3034026 [confirmation] TRUNCATE queries get no confirmation request - bug #3036132 [core] Triggers not fetched if dbname has an hyphen +- patch #3039269 [dbi] Wrong variable checked for nopassword option, + thanks to Will Palmer - wpalmer 3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index ad6d545..b5915df 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -109,9 +109,8 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu if (!$server) { $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); - // Retry with empty password if we're allowed to - if ($return_value == false && isset($cfg['Server']['nopassword']) && $cfg['Server']['nopassword'] && !$is_controluser) { + if ($return_value == false && isset($GLOBALS['cfg']['Server']['nopassword']) && $GLOBALS['cfg']['Server']['nopassword'] && !$is_controluser) { $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags); } } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5-14-gd42dab9
by Marc Delisle 05 Aug '10

05 Aug '10

The branch, QA_3_3 has been updated via d42dab9dd48e337f9b4e8f59f16e04db908ce5e8 (commit) via 158517d7644b83459dc67210e66c0c8b96c3d4cd (commit) from fd1d214d35270f881ae4a12555b1a0f467e2381a (commit) - Log ----------------------------------------------------------------- commit d42dab9dd48e337f9b4e8f59f16e04db908ce5e8 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Aug 5 12:22:56 2010 -0400 patch #3039269 [dbi] Wrong variable checked for nopassword option commit 158517d7644b83459dc67210e66c0c8b96c3d4cd Author: Will Palmer <wmpalmer(a)gmail.com> Date: Wed Aug 4 09:32:58 2010 +0100 bug [mysqli] non-global $cfg referenced where $GLOBAL['cfg'] expected ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/dbi/mysqli.dbi.lib.php | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b570447..ab33f1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA them to string. - bug #3034026 [confirmation] TRUNCATE queries get no confirmation request - bug #3036132 [core] Triggers not fetched if dbname has an hyphen +- patch #3039269 [dbi] Wrong variable checked for nopassword option, + thanks to Will Palmer - wpalmer 3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 913bce6..f3bcf26 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -110,9 +110,8 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu if (!$server) { $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); - // Retry with empty password if we're allowed to - if ($return_value == false && isset($cfg['Server']['nopassword']) && $cfg['Server']['nopassword'] && !$is_controluser) { + if ($return_value == false && isset($GLOBALS['cfg']['Server']['nopassword']) && $GLOBALS['cfg']['Server']['nopassword'] && !$is_controluser) { $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags); } } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6126-gd46bb6d
by Marc Delisle 03 Aug '10

03 Aug '10

The branch, master has been updated via d46bb6d87767ae7e9da1e4182f95ba1d885e26e9 (commit) from 29cc23905784221598960c1434c010b36cdcdeb0 (commit) - Log ----------------------------------------------------------------- commit d46bb6d87767ae7e9da1e4182f95ba1d885e26e9 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 3 16:21:17 2010 -0400 remove custom MIME type change for BLOB streaming because in its current version it can be a very costly operation ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- bs_change_mime_type.php | 48 --------------------------------------- js/functions.js | 40 -------------------------------- libraries/blobstreaming.lib.php | 3 +- 4 files changed, 3 insertions(+), 90 deletions(-) delete mode 100644 bs_change_mime_type.php diff --git a/Documentation.html b/Documentation.html index 8e6e911..5797984 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4321,7 +4321,7 @@ chmod o+rwx tmp <li>In <tt>config.inc.php</tt> your host should be defined with a FQDN (fully qualified domain name) instead of "localhost".</li> <li>Ensure that your target table is under the <tt>PBXT</tt> storage engine and has a <tt>LONGBLOB</tt> column (which must be nullable if you want to remove the BLOB reference from it).</li> <li>When you insert or update a row in this table, put a checkmark on the "Upload to BLOB repository" optional choice; otherwise, the upload will be done directly in your LONGBLOB column instead of the repository.</li> - <li>Finally when you browse your table, you'll see in your column a link to stream your data, for example "View image". A header containing the correct MIME-type will be sent to your browser; this MIME-type was stored at upload time but in case it's incorrect, it's possible to edit it by clicking on the displayed MIME-type.</li> + <li>Finally when you browse your table, you'll see in your column a link to stream your data, for example "View image". A header containing the correct MIME-type will be sent to your browser; this MIME-type was stored at upload time.</li> </ol> <h4 id="faq6_26"> diff --git a/bs_change_mime_type.php b/bs_change_mime_type.php deleted file mode 100644 index edefae1..0000000 --- a/bs_change_mime_type.php +++ /dev/null @@ -1,48 +0,0 @@ -<?php -/* vim: set expandtab sw=4 ts=4 sts=4: */ - /** - * @package BLOBStreaming - */ - - /** - * Core library. - */ - require_once './libraries/common.inc.php'; - - /** - * @var string contains database name - */ - $bsDB = isset($_REQUEST['bs_db']) ? urldecode($_REQUEST['bs_db']) : NULL; - - /** - * @var string contains table name - */ - $bsTable = isset($_REQUEST['bs_table']) ? urldecode($_REQUEST['bs_table']) : NULL; - - /** - * @var string contains BLOB reference - */ - $bsReference = isset($_REQUEST['bs_reference']) ? urldecode($_REQUEST['bs_reference']) : NULL; - - /** - * @var string contains MIME type - */ - $bsNewMIMEType = isset($_REQUEST['bs_new_mime_type']) ? urldecode($_REQUEST['bs_new_mime_type']) : NULL; - - // necessary variables exist - if ($bsDB && $bsTable && $bsReference && $bsNewMIMEType) - { - if (PMA_BS_SetContentType($bsDB, $bsTable, $bsReference, $bsNewMIMEType)) { - // determine redirector page - $newLoc = $cfg['PmaAbsoluteUri'] . 'sql.php?' . PMA_generate_common_url ('','', '&') . (isset($bsDB) ? '&db=' . urlencode($bsDB) : '') . (isset($bsTable) ? '&table=' . urlencode($bsTable) : '') . (isset($token) ? '&token=' . urlencode($token) : '') . (isset($goto) ? '&goto=' . urlencode($goto) : '') . '&reload=1&purge=1'; - - // redirect to specified page - ?> -<script> -window.location = "<?php echo $newLoc ?>"; -</script> - <?php - } // end if ($result) - } // end if ($bsDB && $bsTable && $bsReference && $bsNewMIMEType) - -?> diff --git a/js/functions.js b/js/functions.js index 162e80c..3ebdcbf 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1661,46 +1661,6 @@ function popupBSMedia(url_params, bs_ref, m_type, is_cust_type, w_width, w_heigh } /** - * popups a request for changing MIME types for files in the BLOB repository - * - * @param var db database name - * @param var table table name - * @param var reference BLOB repository reference - * @param var current_mime_type current MIME type associated with BLOB repository reference - */ -function requestMIMETypeChange(db, table, reference, current_mime_type) -{ - // no mime type specified, set to default (nothing) - if (undefined == current_mime_type) - current_mime_type = ""; - - // prompt user for new mime type - var new_mime_type = prompt("Enter custom MIME type", current_mime_type); - - // if new mime_type is specified and is not the same as the previous type, request for mime type change - if (new_mime_type && new_mime_type != current_mime_type) - changeMIMEType(db, table, reference, new_mime_type); -} - -/** - * changes MIME types for files in the BLOB repository - * - * @param var db database name - * @param var table table name - * @param var reference BLOB repository reference - * @param var mime_type new MIME type to be associated with BLOB repository reference - */ -function changeMIMEType(db, table, reference, mime_type) -{ - // specify url and parameters for jQuery POST - var mime_chg_url = 'bs_change_mime_type.php'; - var params = { bs_db: db, bs_table: table, bs_reference: reference, bs_new_mime_type: mime_type }; - - // jQuery POST - jQuery.post(mime_chg_url, params); -} - -/** * Jquery Coding for inline editing SQL_QUERY */ $(document).ready(function(){ diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index 707fc24..594e5f1 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -332,7 +332,8 @@ function PMA_BS_CreateReferenceLink($bs_reference, $db_name) return 'Error'; } - $output = "<a href=\"#\" onclick=\"requestMIMETypeChange('" . urlencode($db_name) . "', '" . urlencode($GLOBALS['table']) . "', '" . urlencode($bs_reference) . "', '" . urlencode($content_type) . "')\">$content_type</a>"; + //$output = "<a href=\"#\" onclick=\"requestMIMETypeChange('" . urlencode($db_name) . "', '" . urlencode($GLOBALS['table']) . "', '" . urlencode($bs_reference) . "', '" . urlencode($content_type) . "')\">$content_type</a>"; + $output = $content_type; // specify custom HTML for various content types switch ($content_type) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6125-g29cc239
by Marc Delisle 03 Aug '10

03 Aug '10

The branch, master has been updated via 29cc23905784221598960c1434c010b36cdcdeb0 (commit) from a8852c5dc9afd08a3bf00eea4273aef1bca6316e (commit) - Log ----------------------------------------------------------------- commit 29cc23905784221598960c1434c010b36cdcdeb0 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 3 13:14:25 2010 -0400 unused code ----------------------------------------------------------------------- Summary of changes: libraries/blobstreaming.lib.php | 31 ------------------------------- 1 files changed, 0 insertions(+), 31 deletions(-) diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index fc845e8..707fc24 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -46,7 +46,6 @@ function initPBMSDatabase() * @uses PMA_Config::get() * @uses PMA_Config::settings() * @uses PMA_Config::set() - * @uses PMA_BS_SetVariables() * @uses PMA_BS_GetVariables() * @uses PMA_cacheSet() * @uses PMA_cacheGet() @@ -203,36 +202,6 @@ function checkBLOBStreamingPlugins() } /** - * sets BLOBStreaming variables to a list of specified arguments - * @access public - * @uses PMA_DBI_query() - * @returns boolean - success of variables setup -*/ - -function PMA_BS_SetVariables($bs_variables) -{ - // if no variables exist in array, return false - if (empty($bs_variables) || count($bs_variables) == 0) - return FALSE; - - // set BS variables to those specified in array - foreach ($bs_variables as $key=>$val) - if (!is_null($val) && strlen($val) > 0) - { - // set BS variable to specified value - $query = "SET GLOBAL $key=" . PMA_sqlAddSlashes($val); - $result = PMA_DBI_query($query); - - // if query fails execution, return false - if (!$result) - return FALSE; - } // end if (!is_null($val) && strlen($val) > 0) - - // return true on success - return TRUE; -} - -/** * returns a list of BLOBStreaming variables used by MySQL * * @access public hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6124-ga8852c5
by Marc Delisle 03 Aug '10

03 Aug '10

The branch, master has been updated via a8852c5dc9afd08a3bf00eea4273aef1bca6316e (commit) from 5675555d5a67800ca86888a733bd050175bc975f (commit) - Log ----------------------------------------------------------------- commit a8852c5dc9afd08a3bf00eea4273aef1bca6316e Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 3 13:10:31 2010 -0400 JSON exported file extension should be .json ----------------------------------------------------------------------- Summary of changes: libraries/export/json.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/export/json.php b/libraries/export/json.php index 0355d9a..5a09265 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -13,7 +13,7 @@ if (! defined('PHPMYADMIN')) { if (isset($plugin_list)) { $plugin_list['json'] = array( 'text' => 'JSON', - 'extension' => 'php', + 'extension' => 'json', 'mime_type' => 'text/plain', 'options' => array( array( hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6123-g5675555
by Marc Delisle 03 Aug '10

03 Aug '10

The branch, master has been updated via 5675555d5a67800ca86888a733bd050175bc975f (commit) from b2a55f1ef25e88a24e4dcc31302890be380154fe (commit) - Log ----------------------------------------------------------------- commit 5675555d5a67800ca86888a733bd050175bc975f Author: Hauke Henningsen <blubberkeks152(a)users.sourceforge.net> Date: Tue Aug 3 13:08:21 2010 -0400 patch #3038312 [export] JSON export ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 + libraries/export/{php_array.php => json.php} | 44 ++++++++++++-------------- 2 files changed, 22 insertions(+), 24 deletions(-) copy libraries/export/{php_array.php => json.php} (72%) diff --git a/ChangeLog b/ChangeLog index e27a334..4242ca5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,8 @@ $Id$ - [interface] Fixed rendering of error/notice/info titles background. - patch #3038293 [doc] Language and grammar fixes, thanks to Isaac Bennetch - ibennetch +- patch #3038312 [export] JSON export, + thanks to Hauke Henningsen - blubberkeks152 3.3.6.0 (not yet released) - bug #3033063 [core] Navi gets wrong db name diff --git a/libraries/export/php_array.php b/libraries/export/json.php similarity index 72% copy from libraries/export/php_array.php copy to libraries/export/json.php index 7d1fb5e..0355d9a 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/json.php @@ -1,8 +1,7 @@ <?php /** - * Set of functions used to build dumps of tables as PHP Arrays + * Set of functions used to build dumps of tables as JSON * - * @version 0.2b (20090704) */ if (! defined('PHPMYADMIN')) { exit; @@ -12,8 +11,8 @@ if (! defined('PHPMYADMIN')) { * */ if (isset($plugin_list)) { - $plugin_list['php_array'] = array( - 'text' => __('PHP array'), + $plugin_list['json'] = array( + 'text' => 'JSON', 'extension' => 'php', 'mime_type' => 'text/plain', 'options' => array( @@ -22,7 +21,7 @@ if (isset($plugin_list)) { 'name' => 'data', ), ), - 'options_text' => __('Options'), + 'options_text' => 'strOptions', ); } else { @@ -39,7 +38,7 @@ if (isset($plugin_list)) { */ function PMA_exportComment($text) { - PMA_exportOutputHandler('// ' . $text . $GLOBALS['crlf']); + PMA_exportOutputHandler('/* ' . $text . ' */' . $GLOBALS['crlf']); return true; } @@ -65,10 +64,9 @@ function PMA_exportFooter() function PMA_exportHeader() { PMA_exportOutputHandler( - '<?php' . $GLOBALS['crlf'] - . '/**' . $GLOBALS['crlf'] - . ' * Export to PHP Array plugin for PHPMyAdmin' . $GLOBALS['crlf'] - . ' * @version 0.2b' . $GLOBALS['crlf'] + '/**' . $GLOBALS['crlf'] + . ' Export to JSON plugin for PHPMyAdmin' . $GLOBALS['crlf'] + . ' @version 0.1' . $GLOBALS['crlf'] . ' */' . $GLOBALS['crlf'] . $GLOBALS['crlf'] ); return true; @@ -85,7 +83,7 @@ function PMA_exportHeader() */ function PMA_exportDBHeader($db) { - PMA_exportOutputHandler('//' . $GLOBALS['crlf'] . '// Database "' . $db . '"' . $GLOBALS['crlf'] . '//' . $GLOBALS['crlf']); + PMA_exportOutputHandler('/* Database \'' . $db . '\' */ ' . $GLOBALS['crlf'] ); return true; } @@ -145,17 +143,15 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) while ($record = PMA_DBI_fetch_row($result)) { $record_cnt++; - + // Output table name as comment if this is the first record of the table if ($record_cnt == 1) { - $buffer .= $crlf . '// ' . $db . '.' . $table . $crlf; - $buffer .= '$' . $table . ' = array(' . $crlf; - $buffer .= ' array('; + $buffer .= '/* ' . $db . '.' . $table . ' */' . $crlf . $crlf; + $buffer .= '[{'; } else { - $buffer .= ',' . $crlf . ' array('; + $buffer .= ', {'; } - for ($i = 0; $i < $columns_cnt; $i++) { $isLastLine = ($i + 1 >= $columns_cnt); @@ -163,22 +159,22 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) $column = $columns[$i]; if (is_null($record[$i])) { - $buffer .= "'" . $column . "'=>null" . (! $isLastLine ? ',' : ''); + $buffer .= '"' . $column . '": null' . (! $isLastLine ? ',' : ''); } elseif (is_numeric($record[$i])) { - $buffer .= "'" . $column . "'=>" . $record[$i] . (! $isLastLine ? ',' : ''); + $buffer .= '"' . $column . '": ' . $record[$i] . (! $isLastLine ? ',' : ''); } else { - $buffer .= "'" . $column . "'=>'" . addslashes($record[$i]) . "'" . (! $isLastLine ? ',' : ''); + $buffer .= '"' . $column . '": "' . addslashes($record[$i]) . '"' . (! $isLastLine ? ',' : ''); } } - $buffer .= ')'; + $buffer .= '}'; } - - $buffer .= $crlf . ');' . $crlf; + + $buffer .= ']'; if (! PMA_exportOutputHandler($buffer)) { return FALSE; } - + PMA_DBI_free_result($result); return true; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6122-gb2a55f1
by Marc Delisle 03 Aug '10

03 Aug '10

The branch, master has been updated via b2a55f1ef25e88a24e4dcc31302890be380154fe (commit) from 6383f23035e07f80ada7eea4082856756c2c2bd7 (commit) - Log ----------------------------------------------------------------- commit b2a55f1ef25e88a24e4dcc31302890be380154fe Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 3 12:43:45 2010 -0400 For BLOB streaming, LONGBLOB colum must be nullable ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index 43db8fa..8e6e911 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4319,7 +4319,7 @@ chmod o+rwx tmp <ol> <li>In <tt>config.inc.php</tt> your host should be defined with a FQDN (fully qualified domain name) instead of "localhost".</li> - <li>Ensure that your target table is under the PBXT storage engine and has a LONGBLOB column.</li> + <li>Ensure that your target table is under the <tt>PBXT</tt> storage engine and has a <tt>LONGBLOB</tt> column (which must be nullable if you want to remove the BLOB reference from it).</li> <li>When you insert or update a row in this table, put a checkmark on the "Upload to BLOB repository" optional choice; otherwise, the upload will be done directly in your LONGBLOB column instead of the repository.</li> <li>Finally when you browse your table, you'll see in your column a link to stream your data, for example "View image". A header containing the correct MIME-type will be sent to your browser; this MIME-type was stored at upload time but in case it's incorrect, it's possible to edit it by clicking on the displayed MIME-type.</li> </ol> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6121-g6383f23
by Marc Delisle 03 Aug '10

03 Aug '10

The branch, master has been updated via 6383f23035e07f80ada7eea4082856756c2c2bd7 (commit) from 887e2be664f04827fe164d724d233598a251bcb9 (commit) - Log ----------------------------------------------------------------- commit 6383f23035e07f80ada7eea4082856756c2c2bd7 Author: Isaac Bennetch <ibennetch(a)users.sourceforge.net> Date: Tue Aug 3 12:39:02 2010 -0400 patch #3038293 [doc] Language and grammar fixes ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06a26a0..e27a334 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,8 @@ $Id$ configuration storage. - [interface] Move drop/empty links from being tabs to Operations tab. - [interface] Fixed rendering of error/notice/info titles background. +- patch #3038293 [doc] Language and grammar fixes, + thanks to Isaac Bennetch - ibennetch 3.3.6.0 (not yet released) - bug #3033063 [core] Navi gets wrong db name diff --git a/Documentation.html b/Documentation.html index 62dd51f..43db8fa 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2425,11 +2425,11 @@ setfacl -d -m "g:www-data:rwx" tmp transformations.</p> <p> Because the user cannot enter own mimetypes, it is kept sure that transformations - always work. It makes no sense to apply a transformation to a mimetype, the + always work. It makes no sense to apply a transformation to a mimetype the transform-function doesn't know to handle.</p> <p> One can, however, use empty mime-types and global transformations which should work - for many mimetypes. You can also use transforms on a different mimetype they where built + for many mimetypes. You can also use transforms on a different mimetype than what they where built for, but pay attention to option usage as well as what the transformation does to your column.</p> @@ -4337,8 +4337,8 @@ chmod o+rwx tmp In all places where phpMyAdmin accepts format strings, you can use <code>@VARIABLE@</code> expansion and <a href="http://php.net/strftime">strftime</a> format strings. The - expanded variables depend on a context (eg. if you don't have chosen - table, you can not get table name), but following variables can be used: + expanded variables depend on a context (for example, if you haven't chosen a + table, you can not get the table name), but the following variables can be used: </p> <dl> <dt><code>@HTTP_HOST@</code></dt> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6120-g887e2be
by Marc Delisle 01 Aug '10

01 Aug '10

The branch, master has been updated via 887e2be664f04827fe164d724d233598a251bcb9 (commit) via fd1d214d35270f881ae4a12555b1a0f467e2381a (commit) via e6e78a1fa450674f784b7d03d31793d7384913cd (commit) from f9f987f544cb71e44126b362f456150640d91daf (commit) - Log ----------------------------------------------------------------- commit 887e2be664f04827fe164d724d233598a251bcb9 Merge: f9f987f544cb71e44126b362f456150640d91daf fd1d214d35270f881ae4a12555b1a0f467e2381a Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Aug 1 06:20:10 2010 -0400 fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/database_interface.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9671597..06a26a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,7 @@ $Id$ - bug #3031705 [core] Fix generating condition for real numbers by comparing them to string. - bug #3034026 [confirmation] TRUNCATE queries get no confirmation request +- bug #3036132 [core] Triggers not fetched if dbname has an hyphen 3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index c5b3ca4..8eba111 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1389,7 +1389,7 @@ function PMA_DBI_get_triggers($db, $table, $delimiter = '//') // instead of WHERE EVENT_OBJECT_SCHEMA='dbname' $triggers = PMA_DBI_fetch_result("SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= '" . PMA_sqlAddslashes($db,true) . "' and EVENT_OBJECT_TABLE = '" . PMA_sqlAddslashes($table, true) . "';"); } else { - $triggers = PMA_DBI_fetch_result("SHOW TRIGGERS FROM " . PMA_sqlAddslashes($db,true) . " LIKE '" . PMA_sqlAddslashes($table, true) . "';"); + $triggers = PMA_DBI_fetch_result("SHOW TRIGGERS FROM " . PMA_backquote(PMA_sqlAddslashes($db,true)) . " LIKE '" . PMA_sqlAddslashes($table, true) . "';"); } if ($triggers) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5-12-gfd1d214
by Marc Delisle 01 Aug '10

01 Aug '10

The branch, QA_3_3 has been updated via fd1d214d35270f881ae4a12555b1a0f467e2381a (commit) from e6e78a1fa450674f784b7d03d31793d7384913cd (commit) - Log ----------------------------------------------------------------- commit fd1d214d35270f881ae4a12555b1a0f467e2381a Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Aug 1 06:17:03 2010 -0400 bug #3036132 [core] Triggers not fetched if dbname has an hyphen ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/database_interface.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3482348..b570447 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +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. - bug #3034026 [confirmation] TRUNCATE queries get no confirmation request +- bug #3036132 [core] Triggers not fetched if dbname has an hyphen 3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index a7d9e72..501c34d 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1401,7 +1401,7 @@ function PMA_DBI_get_triggers($db, $table, $delimiter = '//') // instead of WHERE EVENT_OBJECT_SCHEMA='dbname' $triggers = PMA_DBI_fetch_result("SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= '" . PMA_sqlAddslashes($db,true) . "' and EVENT_OBJECT_TABLE = '" . PMA_sqlAddslashes($table, true) . "';"); } else { - $triggers = PMA_DBI_fetch_result("SHOW TRIGGERS FROM " . PMA_sqlAddslashes($db,true) . " LIKE '" . PMA_sqlAddslashes($table, true) . "';"); + $triggers = PMA_DBI_fetch_result("SHOW TRIGGERS FROM " . PMA_backquote(PMA_sqlAddslashes($db,true)) . " LIKE '" . PMA_sqlAddslashes($table, true) . "';"); } if ($triggers) { hooks/post-receive -- phpMyAdmin

1 0