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

Merge branch 'QA_4_6'

Browse Source
This commit is contained in:
Michal Čihař 2016-02-12 10:45:51 +01:00
commit 055d2be691
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.php
View File

@ -541,7 +541,7 @@ if (! empty($_SESSION['encryption_key'])
* Check for existence of config directory which should not exist in
* production environment.
*/
if (file_exists('config')) {
if (@file_exists('config')) {
trigger_error(
__(
'Directory [code]config[/code], which is used by the setup script, ' .
@ -653,7 +653,7 @@ if ($cfg['SuhosinDisableWarning'] == false
*
* The data file is created while creating release by ./scripts/remove-incomplete-mo
*/
if (file_exists('libraries/language_stats.inc.php')) {
if (@file_exists('libraries/language_stats.inc.php')) {
include 'libraries/language_stats.inc.php';
/*
* This message is intentionally not translated, because we're

2
libraries/Config.php
View File

@ -763,7 +763,7 @@ class Config
public function loadDefaults()
{
$cfg = array();
if (! file_exists($this->default_source)) {
if (! @file_exists($this->default_source)) {
$this->error_config_default_file = true;
return false;
}

2
libraries/LanguageManager.php
View File

@ -576,7 +576,7 @@ class LanguageManager
. '/LC_MESSAGES/phpmyadmin.mo';
if ($file != "."
&& $file != ".."
&& file_exists($path)
&& @file_exists($path)
) {
$result[] = $file;
}

2
libraries/file_listing.lib.php
View File

@ -16,7 +16,7 @@
*/
function PMA_getDirContent($dir, $expression = '')
{
if (!file_exists($dir) || !($handle = @opendir($dir))) {
if (!@file_exists($dir) || !($handle = @opendir($dir))) {
return false;
}

4
libraries/plugins/auth/AuthenticationCookie.php
View File

@ -101,7 +101,7 @@ class AuthenticationCookie extends AuthenticationPlugin
$header->disableMenuAndConsole();
$header->disableWarnings();
if (file_exists(CUSTOM_HEADER_FILE)) {
if (@file_exists(CUSTOM_HEADER_FILE)) {
include CUSTOM_HEADER_FILE;
}
echo '
@ -249,7 +249,7 @@ class AuthenticationCookie extends AuthenticationPlugin
echo '</div>';
}
echo '</div>';
if (file_exists(CUSTOM_FOOTER_FILE)) {
if (@file_exists(CUSTOM_FOOTER_FILE)) {
include CUSTOM_FOOTER_FILE;
}
if (! defined('TESTSUITE')) {

2
libraries/plugins/auth/AuthenticationHttp.php
View File

@ -101,7 +101,7 @@ class AuthenticationHttp extends AuthenticationPlugin
);
$response->addHTML('</h3>');
if (file_exists(CUSTOM_FOOTER_FILE)) {
if (@file_exists(CUSTOM_FOOTER_FILE)) {
include CUSTOM_FOOTER_FILE;
}

4
libraries/plugins/auth/swekey/swekey.auth.lib.php
View File

@ -22,7 +22,7 @@ function Swekey_Auth_check()
$_SESSION['SWEKEY'] = array();
}
$_SESSION['SWEKEY']['ENABLED'] = (! empty($confFile) && file_exists($confFile));
$_SESSION['SWEKEY']['ENABLED'] = (! empty($confFile) && @file_exists($confFile));
// Load the swekey.conf file the first time
if ($_SESSION['SWEKEY']['ENABLED']
@ -167,7 +167,7 @@ function Swekey_Auth_error()
// echo "<!-- exists -->\n";
}
if (file_exists($caFile)) {
if (@file_exists($caFile)) {
Swekey_SetCAFile($caFile);
} elseif (! empty($caFile)
&& (substr($_SESSION['SWEKEY']['CONF_SERVER_CHECK'], 0, 8) == "https://")

2
libraries/plugins/export/ExportPdf.php
View File

@ -19,7 +19,7 @@ use PMA\libraries\properties\options\items\TextPropertyItem;
/**
* Skip the plugin if TCPDF is not available.
*/
if (!file_exists(TCPDF_INC)) {
if (!@file_exists(TCPDF_INC)) {
$GLOBALS['skip_import'] = true;
return;
}

2
libraries/plugins/schema/pdf/PdfRelationSchema.php
View File

@ -14,7 +14,7 @@ use PMA\libraries\PDF as PDF_lib;
/**
* Skip the plugin if TCPDF is not available.
*/
if (! file_exists(TCPDF_INC)) {
if (! @file_exists(TCPDF_INC)) {
$GLOBALS['skip_import'] = true;
return;
}