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

enable more features when relation is broken

Browse Source
This commit is contained in:
Marc Delisle
2003-06-12 14:50:05 +00:00
parent 89bf261bdf
commit a32ffd69c3
2 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-06-12 Marc Delisle <lem9@users.sourceforge.net>
* libraries/relation.lib.php3: bug 751787: should not disable all
the features, when the relation feature is broken
2003-06-11 Marc Delisle <lem9@users.sourceforge.net> 2003-06-11 Marc Delisle <lem9@users.sourceforge.net>
* libraries/auth/cookie.auth.lib.php3: undefined scheme * libraries/auth/cookie.auth.lib.php3: undefined scheme
* main.php3: undefined scheme * main.php3: undefined scheme

58
libraries/relation.lib.php3
View File

@@ -137,41 +137,41 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){
if (isset($cfgRelation['relation'])) { if (isset($cfgRelation['relation'])) {
$cfgRelation['relwork'] = TRUE; $cfgRelation['relwork'] = TRUE;
if (isset($cfgRelation['table_info'])) { if (isset($cfgRelation['table_info'])) {
$cfgRelation['displaywork'] = TRUE; $cfgRelation['displaywork'] = TRUE;
} }
if (isset($cfgRelation['table_coords']) && isset($cfgRelation['pdf_pages'])) { }
$cfgRelation['pdfwork'] = TRUE; if (isset($cfgRelation['table_coords']) && isset($cfgRelation['pdf_pages'])) {
} $cfgRelation['pdfwork'] = TRUE;
if (isset($cfgRelation['column_info'])) { }
$cfgRelation['commwork'] = TRUE; if (isset($cfgRelation['column_info'])) {
$cfgRelation['commwork'] = TRUE;
if ($cfg['Server']['verbose_check']) {
$mime_query = 'SHOW FIELDS FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']); if ($cfg['Server']['verbose_check']) {
$mime_rs = PMA_query_as_cu($mime_query, FALSE); $mime_query = 'SHOW FIELDS FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']);
$mime_rs = PMA_query_as_cu($mime_query, FALSE);
$mime_field_mimetype = FALSE; $mime_field_mimetype = FALSE;
$mime_field_transformation = FALSE; $mime_field_transformation = FALSE;
$mime_field_transformation_options = FALSE; $mime_field_transformation_options = FALSE;
while ($curr_mime_field = @PMA_mysql_fetch_array($mime_rs)) { while ($curr_mime_field = @PMA_mysql_fetch_array($mime_rs)) {
if ($curr_mime_field[0] == 'mimetype') { if ($curr_mime_field[0] == 'mimetype') {
$mime_field_mimetype = TRUE; $mime_field_mimetype = TRUE;
} else if ($curr_mime_field[0] == 'transformation') { } else if ($curr_mime_field[0] == 'transformation') {
$mime_field_transformation = TRUE; $mime_field_transformation = TRUE;
} else if ($curr_mime_field[0] == 'transformation_options') { } else if ($curr_mime_field[0] == 'transformation_options') {
$mime_field_transformation_options = TRUE; $mime_field_transformation_options = TRUE;
}
} }
}
if ($mime_field_mimetype == TRUE
&& $mime_field_transformation == TRUE if ($mime_field_mimetype == TRUE
&& $mime_field_transformation_options == TRUE) { && $mime_field_transformation == TRUE
$cfgRelation['mimework'] = TRUE; && $mime_field_transformation_options == TRUE) {
}
} else {
$cfgRelation['mimework'] = TRUE; $cfgRelation['mimework'] = TRUE;
} }
} else {
$cfgRelation['mimework'] = TRUE;
} }
} // end if }
if (isset($cfgRelation['history'])) { if (isset($cfgRelation['history'])) {
$cfgRelation['historywork'] = TRUE; $cfgRelation['historywork'] = TRUE;