Merge remote-tracking branch 'origin/master'

This commit is contained in:
Michal Čihař 2012-06-01 14:37:00 +02:00
commit 54e058a45a
2 changed files with 4 additions and 0 deletions

View File

@ -12,6 +12,8 @@
* string $type: type of system variable
* string $format: if set to 'byte' it will format the variable
* with PMA_formatByteDown()
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
exit;

View File

@ -2,6 +2,8 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* URL redirector to avoid leaking Referer with some sensitive information.
*
* @package PhpMyAdmin
*/
/**