gian/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:
Michal Čihař 2012-04-14 16:07:15 +02:00
commit c9cf22b7d2
5 changed files with 1 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation.html
View File

@ -1238,19 +1238,6 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
data (referring to tables which no longer exist).<br />
We only keep this number of newest rows in table_uiprefs and automatically delete older rows.</dd>
<dt><span id="cfg_Servers_verbose_check">$cfg['Servers'][$i]['verbose_check']</span> boolean
</dt>
<dd>Because release 2.5.0 introduced the new MIME-transformation support, the
column_info table got enhanced with three new columns. If the above variable
is set to <code>TRUE</code> (default) phpMyAdmin will check if you have the
latest table structure available. If not, it will emit a warning to the
superuser.<br /><br />
You can disable this checking behavior by setting the variable to false,
which should offer a performance increase.<br /><br />
Recommended to set to FALSE, when you are sure, your table structure is
up to date.</dd>
<dt><span id="cfg_Servers_AllowRoot">$cfg['Servers'][$i]['AllowRoot']</span>
boolean</dt>
<dd>Whether to allow root access. This is just a shortcut for the AllowDeny rules below.

8
libraries/config.default.php
View File

@ -399,14 +399,6 @@ $cfg['Servers'][$i]['userconfig'] = '';
*/
$cfg['Servers'][$i]['MaxTableUiprefs'] = 100;
/**
* set to false if you know that your pma_* tables are up to date.
* This prevents compatibility checks and thereby increases performance.
*
* @global boolean $cfg['Servers'][$i]['verbose_check']
*/
$cfg['Servers'][$i]['verbose_check'] = true;
/**
* whether to allow root login
*

2
libraries/config/messages.inc.php
View File

@ -449,8 +449,6 @@ $strConfigServers_userconfig_desc = __('Leave blank for no user preferences stor
$strConfigServers_userconfig_name = __('User preferences storage table');
$strConfigServers_user_desc = __('Leave empty if not using config auth');
$strConfigServers_user_name = __('User for config auth');
$strConfigServers_verbose_check_desc = __('Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance');
$strConfigServers_verbose_check_name = __('Verbose check');
$strConfigServers_verbose_desc = __('A user-friendly description of this server. Leave blank to display the hostname instead.');
$strConfigServers_verbose_name = __('Verbose name of this server');
$strConfigShowAll_desc = __('Whether a user should be displayed a &quot;show all (rows)&quot; button');

1
libraries/config/setup.forms.php
View File

@ -67,7 +67,6 @@ $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array(
'controlhost',
'controluser',
'controlpass',
'verbose_check',
'bookmarktable' => 'pma_bookmark',
'relation' => 'pma_relation',
'userconfig' => 'pma_userconfig',

29
libraries/relation.lib.php
View File

@ -293,34 +293,7 @@ function PMA__getRelationsParam()
if (isset($cfgRelation['column_info'])) {
$cfgRelation['commwork'] = true;
if ($GLOBALS['cfg']['Server']['verbose_check']) {
$mime_query = PMA_DBI_get_columns_sql($cfgRelation['db'], $cfgRelation['column_info']);
$mime_rs = PMA_query_as_controluser($mime_query, false);
$mime_field_mimetype = false;
$mime_field_transformation = false;
$mime_field_transformation_options = false;
while ($curr_mime_field = @PMA_DBI_fetch_row($mime_rs)) {
if ($curr_mime_field[0] == 'mimetype') {
$mime_field_mimetype = true;
} elseif ($curr_mime_field[0] == 'transformation') {
$mime_field_transformation = true;
} elseif ($curr_mime_field[0] == 'transformation_options') {
$mime_field_transformation_options = true;
}
}
PMA_DBI_free_result($mime_rs);
if ($mime_field_mimetype
&& $mime_field_transformation
&& $mime_field_transformation_options
) {
$cfgRelation['mimework'] = true;
}
} else {
$cfgRelation['mimework'] = true;
}
$cfgRelation['mimework'] = true;
}
if (isset($cfgRelation['history'])) {