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

Language updates, and a missing commit from rabus (librarires/* files

Browse Source 
dealing with column_comments => column_info.). I didn't want to interfere,
but I had updated my cvs and had problems with the comments, so I finished
the search&replace-job. Maybe you want to look at the
config_import.lib-change, which is the only not-straight-ahead
search&replace operation.
This commit is contained in:
Garvin Hicking
2003-02-25 15:59:26 +00:00
parent 97f5cb8ea2
commit 8718ab8275
6 changed files with 67 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/transformations.lib.php3
View File

@@ -95,7 +95,7 @@ if (!defined('PMA_TRANSFORMATION_LIB_INCLUDED')){
function PMA_getMIME($db, $table, $strict = false) {
global $cfgRelation;
$com_qry = 'SELECT column_name, mimetype, transformation, transformation_options FROM ' . PMA_backquote($cfgRelation['column_comments'])
$com_qry = 'SELECT column_name, mimetype, transformation, transformation_options FROM ' . PMA_backquote($cfgRelation['column_info'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''
. ' AND (mimetype != \'\'' . (!$strict ? ' OR transformation != \'\' OR transformation_options != \'\'' : '') . ')';
@@ -135,7 +135,7 @@ if (!defined('PMA_TRANSFORMATION_LIB_INCLUDED')){
function PMA_setMIME($db, $table, $key, $mimetype, $transformation, $transformation_options, $forcedelete = false) {
global $cfgRelation;
$test_qry = 'SELECT mimetype, ' . PMA_backquote('comment') . ' FROM ' . PMA_backquote($cfgRelation['column_comments'])
$test_qry = 'SELECT mimetype, ' . PMA_backquote('comment') . ' FROM ' . PMA_backquote($cfgRelation['column_info'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''
. ' AND column_name = \'' . PMA_handleSlashes($key) . '\'';
@@ -145,7 +145,7 @@ if (!defined('PMA_TRANSFORMATION_LIB_INCLUDED')){
$row = @PMA_mysql_fetch_array($test_rs);
if (!$forcedelete && (strlen($mimetype) > 0 || strlen($transformation) > 0 || strlen($transformation_options) > 0 || strlen($row['comment']) > 0)) {
$upd_query = 'UPDATE ' . PMA_backquote($cfgRelation['column_comments'])
$upd_query = 'UPDATE ' . PMA_backquote($cfgRelation['column_info'])
. ' SET mimetype = \'' . PMA_handleSlashes($mimetype) . '\','
. ' transformation = \'' . PMA_handleSlashes($transformation) . '\','
. ' transformation_options = \'' . PMA_handleSlashes($transformation_options) . '\''
@@ -153,13 +153,13 @@ if (!defined('PMA_TRANSFORMATION_LIB_INCLUDED')){
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''
. ' AND column_name = \'' . PMA_handleSlashes($key) . '\'';
} else {
$upd_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['column_comments'])
$upd_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['column_info'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''
. ' AND column_name = \'' . PMA_handleSlashes($key) . '\'';
}
} else if (strlen($mimetype) > 0 || strlen($transformation) > 0 || strlen($transformation_options) > 0) {
$upd_query = 'INSERT INTO ' . PMA_backquote($cfgRelation['column_comments'])
$upd_query = 'INSERT INTO ' . PMA_backquote($cfgRelation['column_info'])
. ' (db_name, table_name, column_name, mimetype, transformation, transformation_options) '
. ' VALUES('
. '\'' . PMA_sqlAddslashes($db) . '\','