rfe #1731967 Check for relations support on main page.

This commit is contained in:
Michal Čihař
2009-03-03 13:54:37 +00:00
parent 8e607841f9
commit a2d9d8308c
3 changed files with 21 additions and 1 deletions

View File

@@ -36,6 +36,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
editing, thanks to knittl - knittl editing, thanks to knittl - knittl
+ rfe #2123386 Added option to disable mcrypt warning. + rfe #2123386 Added option to disable mcrypt warning.
- bug #2648502 Request-URI Too Large error from Location header - bug #2648502 Request-URI Too Large error from Location header
+ rfe #1731967 Check for relations support on main page.
3.1.4.0 (not yet released) 3.1.4.0 (not yet released)
+ patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ, + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,

View File

@@ -10,7 +10,8 @@
* Gets some core libraries * Gets some core libraries
*/ */
require_once './libraries/common.inc.php'; require_once './libraries/common.inc.php';
require_once './libraries/db_common.inc.php'; $GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php';
require_once './libraries/relation.lib.php'; require_once './libraries/relation.lib.php';

View File

@@ -302,6 +302,24 @@ if (!empty($_SESSION['auto_blowfish_secret']) &&
trigger_error($strSecretRequired, E_USER_WARNING); trigger_error($strSecretRequired, E_USER_WARNING);
} }
/**
* Check whether relations are supported.
*/
if ($server > 0) {
require_once './libraries/relation.lib.php';
$cfgRelation = PMA_getRelationsParam();
if(!$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
$message = PMA_Message::notice('strRelationNotWorking');
$message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $common_url_query . '">', false);
$message->addParam('</a>', false);
/* Show error if user has configured something, notice elsewhere */
if (!empty($cfg['Servers'][$server]['pmadb'])) {
$message->isError(true);
}
$message->display();
} // end if
}
/** /**
* Warning about different MySQL library and server version * Warning about different MySQL library and server version
* (a difference on the third digit does not count). * (a difference on the third digit does not count).