nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server
2011-03-12 14:40:08 +01:00
parent ca30470a95 93339354a2
commit 31ca66077a
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation.html
View File

@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut 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" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>phpMyAdmin 3.4.0-beta4-dev - Documentation</title> <title>phpMyAdmin 3.4.0-rc1-dev - Documentation</title>
<link rel="stylesheet" type="text/css" href="docs.css" /> <link rel="stylesheet" type="text/css" href="docs.css" />
</head> </head>
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<div id="header"> <div id="header">
<h1> <h1>
<a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
3.4.0-beta4-dev 3.4.0-rc1-dev
Documentation Documentation
</h1> </h1>
</div> </div>

2
README
View File

@@ -1,7 +1,7 @@
phpMyAdmin - Readme phpMyAdmin - Readme
=================== ===================
Version 3.4.0-beta4-dev Version 3.4.0-rc1-dev
A set of PHP-scripts to manage MySQL over the web. A set of PHP-scripts to manage MySQL over the web.

2
libraries/Config.class.php
View File

@@ -96,7 +96,7 @@ class PMA_Config
*/ */
function checkSystem() function checkSystem()
{ {
$this->set('PMA_VERSION', '3.4.0-beta4-dev'); $this->set('PMA_VERSION', '3.4.0-rc1-dev');
/** /**
* @deprecated * @deprecated
*/ */

11
libraries/display_tbl.lib.php
View File

@@ -1325,9 +1325,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// TEXT fields type so we have to ensure it's really a BLOB // TEXT fields type so we have to ensure it's really a BLOB
$field_flags = PMA_DBI_field_flags($dt_result, $i); $field_flags = PMA_DBI_field_flags($dt_result, $i);
// reset $class from $inline_edit_class to just 'data' // remove 'inline_edit' from $class as we can't edit binary data.
// as we can't edit binary data $class = str_replace('inline_edit', '', $class);
$class = 'data';
if (stristr($field_flags, 'BINARY')) { if (stristr($field_flags, 'BINARY')) {
if (!isset($row[$i]) || is_null($row[$i])) { if (!isset($row[$i]) || is_null($row[$i])) {
@@ -1366,9 +1365,9 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// g e o m e t r y // g e o m e t r y
} elseif ($meta->type == 'geometry') { } elseif ($meta->type == 'geometry') {
$geometry_text = PMA_handle_non_printable_contents('GEOMETRY', (isset($row[$i]) ? $row[$i] : ''), $transform_function, $transform_options, $default_function, $meta); $geometry_text = PMA_handle_non_printable_contents('GEOMETRY', (isset($row[$i]) ? $row[$i] : ''), $transform_function, $transform_options, $default_function, $meta);
// reset $class from $inline_edit_class to 'data'
// as we can't edit geometry data // remove 'inline_edit' from $class as we can't edit geometry data.
$class = 'data'; $class = str_replace('inline_edit', '', $class);
$vertical_display['data'][$row_no][$i] = PMA_buildValueDisplay($class, $condition_field, $geometry_text); $vertical_display['data'][$row_no][$i] = PMA_buildValueDisplay($class, $condition_field, $geometry_text);
unset($geometry_text); unset($geometry_text);