- bug #3059806 Supporting running from CIFS/Samba shares

This commit is contained in:
Jo Michael 2012-04-11 01:04:13 +02:00
parent 378aae6152
commit c79f6dfef2
2 changed files with 17 additions and 7 deletions

View File

@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog
+ Patch #3507111 Display distinct results, linked to corresponding data rows
- bug #3507917 [export] JSON has unescaped values for allegedly numeric columns
+ rfe #3516187 show tables creation, last update, last check timestamps in db_structure
- bug #3059806 Supporting running from CIFS/Samba shares
3.5.1.0 (not yet released)
- bug #3510784 [edit] Limit clause ignored when sort order is remembered

View File

@ -716,13 +716,22 @@ class PMA_Config
}
if (! is_readable($this->getSource())) {
$this->source_mtime = 0;
die(
sprintf(
__('Existing configuration file (%s) is not readable.'),
$this->getSource()
)
);
// manually check if file is readable
// might be bug #3059806 Supporting running from CIFS/Samba shares
try {
$handle = @fopen($this->getSource(), 'r');
$contents = @fread($handle, @filesize($this->getSource()));
@fclose($handle);
}
catch (Exception $e) {
$this->source_mtime = 0;
die(
sprintf(
__('Existing configuration file (%s) is not readable.'),
$this->getSource()
)
);
}
}
return true;