Fix timestamp in uva condition with MySQL 4.1 (bug #1097593).
This commit is contained in:
@@ -11,6 +11,8 @@ $Source$
|
||||
libraries/keyhandler.js: Use Option key for Safari for moving (bug
|
||||
#1094137), move key handler function to separate file so we have only
|
||||
one, make movement work correctly in vertical display of properties.
|
||||
* libraries/common.lib.php: Fix timestamp in uva condition with MySQL 4.1
|
||||
(bug #1097593).
|
||||
|
||||
2005-01-06 Marc Delisle <lem9@users.sourceforge.net>
|
||||
* tbl_change.php: removed old PHP3-workaround that caused problems
|
||||
|
@@ -1580,9 +1580,9 @@ if (typeof(window.parent) != 'undefined'
|
||||
* Sanitizes $message, taking into account our special codes
|
||||
* for formatting
|
||||
*
|
||||
* @param string the message
|
||||
* @param string the message
|
||||
*
|
||||
* @return string the sanitized message
|
||||
* @return string the sanitized message
|
||||
*
|
||||
* @access public
|
||||
*/
|
||||
@@ -1597,7 +1597,7 @@ if (typeof(window.parent) != 'undefined'
|
||||
'[br]' => '<br />',
|
||||
'[/b]' => '</b>',
|
||||
);
|
||||
return strtr($message, $replace_pairs);
|
||||
return strtr($message, $replace_pairs);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1614,8 +1614,8 @@ if (typeof(window.parent) != 'undefined'
|
||||
global $cfg;
|
||||
|
||||
// Sanitizes $message
|
||||
$message = PMA_sanitize($message);
|
||||
|
||||
$message = PMA_sanitize($message);
|
||||
|
||||
// Corrects the tooltip text via JS if required
|
||||
if (!empty($GLOBALS['table']) && $cfg['ShowTooltip']) {
|
||||
$result = PMA_DBI_try_query('SHOW TABLE STATUS FROM ' . PMA_backquote($GLOBALS['db']) . ' LIKE \'' . PMA_sqlAddslashes($GLOBALS['table'], TRUE) . '\'');
|
||||
@@ -2333,7 +2333,8 @@ if (typeof(document.getElementById) != 'undefined'
|
||||
if (!isset($row[$i]) || is_null($row[$i])) {
|
||||
$condition .= 'IS NULL AND';
|
||||
} else {
|
||||
if ($meta->numeric) {
|
||||
// timestamp is numeric on some MySQL 4.1
|
||||
if ($meta->numeric && $meta->type != 'timestamp') {
|
||||
$condition .= '= ' . $row[$i] . ' AND';
|
||||
} elseif ($meta->type == 'blob'
|
||||
// hexify only if this is a true not empty BLOB
|
||||
|
Reference in New Issue
Block a user