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:
Weblate 2012-11-30 12:58:04 +01:00
commit 1792d4ca56
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/setup.rst
View File

@ -253,7 +253,7 @@ For ':term:`HTTP`' and 'cookie' modes, phpMyAdmin needs a controluser that has
**only** the ``SELECT`` privilege on the *`mysql`.`user` (all columns except
`Password`)*, *`mysql`.`db` (all columns)*, *`mysql`.`host` (all columns)* and
*`mysql`.`tables\_priv` (all columns except `Grantor` and `Timestamp`)* tables.
You must specify the details for the controluser in the :file:`config.inc.php`
You must specify the details for the controluser in the :file:`config.inc.php`
file under the :config:option:`$cfg['Servers'][$i]['controluser']` and
:config:option:`$cfg['Servers'][$i]['controlpass']` settings. The following
example assumes you want to use ``pma`` as the controluser and ``pmapass`` as
@ -332,7 +332,7 @@ Cookie authentication mode
* With this mode, the user can truly log out of phpMyAdmin and log in
back with the same username.
* If you want to log in to arbitrary server see :config:option:`$cfg['AllowArbitraryServer']` directive.
* As mentioned in the section, having the ``mcrypt`` extension will
* As mentioned in the :ref:`require` section, having the ``mcrypt`` extension will
speed up access considerably, but is not required.
.. index:: pair: Signon; Authentication mode
@ -344,9 +344,12 @@ Signon authentication mode
application to authenticate to phpMyAdmin.
* The other application has to store login information into session
data.
* More details in the section.
.. seealso:: :config:option:`$cfg['Servers'][$i]['SignonSession']` :config:option:`$cfg['Servers'][$i]['SignonScript']` :config:option:`$cfg['Servers'][$i]['SignonURL']`
.. seealso::
:config:option:`$cfg['Servers'][$i]['auth_type']`,
:config:option:`$cfg['Servers'][$i]['SignonSession']`,
:config:option:`$cfg['Servers'][$i]['SignonScript']`,
:config:option:`$cfg['Servers'][$i]['SignonURL']`
.. index:: pair: Config; Authentication mode

8
libraries/operations.lib.php
View File

@ -1444,7 +1444,7 @@ function PMA_getQueryAndResultForReorderingTable()
*/
function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys,
$checksum, $is_aria, $page_checksum, $delay_key_write, $is_innodb,
$is_pbxt, $row_format, $tbl_storage_engine, $transactional, $tbl_collation
$is_pbxt, $row_format, $new_tbl_storage_engine, $transactional, $tbl_collation
) {
$table_alters = array();
@ -1454,10 +1454,10 @@ function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys,
$table_alters[] = 'COMMENT = \''
. PMA_Util::sqlAddSlashes($_REQUEST['comment']) . '\'';
}
if (! empty($_REQUEST['new_tbl_storage_engine'])
&& strtolower($_REQUEST['new_tbl_storage_engine']) !== strtolower($tbl_storage_engine)
if (! empty($new_tbl_storage_engine)
&& strtolower($new_tbl_storage_engine) !== strtolower($GLOBALS['tbl_storage_engine'])
) {
$table_alters[] = 'ENGINE = ' . $_REQUEST['new_tbl_storage_engine'];
$table_alters[] = 'ENGINE = ' . $new_tbl_storage_engine;
}
if (! empty($_REQUEST['tbl_collation'])
&& $_REQUEST['tbl_collation'] !== $tbl_collation

6
tbl_operations.php
View File

@ -110,11 +110,11 @@ if (isset($_REQUEST['submitoptions'])) {
&& strtolower($_REQUEST['new_tbl_storage_engine'])
!== strtolower($tbl_storage_engine)
) {
$tbl_storage_engine = $_REQUEST['new_tbl_storage_engine'];
$new_tbl_storage_engine = $_REQUEST['new_tbl_storage_engine'];
// reset the globals for the new engine
list($is_myisam_or_aria, $is_innodb, $is_isam,
$is_berkeleydb, $is_aria, $is_pbxt
) = PMA_setGlobalVariablesForEngine($tbl_storage_engine);
) = PMA_setGlobalVariablesForEngine($new_tbl_storage_engine);
if ($is_aria) {
$transactional = (isset($transactional) && $transactional == '0')
@ -131,7 +131,7 @@ if (isset($_REQUEST['submitoptions'])) {
((isset($page_checksum)) ? $page_checksum : ''),
(empty($delay_key_write) ? '0' : '1'),
$is_innodb, $is_pbxt, $row_format,
$tbl_storage_engine,
$new_tbl_storage_engine,
((isset($transactional) && $transactional == '0') ? '0' : '1'),
$tbl_collation
);