Branch: refs/heads/QA_4_6
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 53b1f9adcc5882838161d3aa6289d93385053fbe
https://github.com/phpmyadmin/phpmyadmin/commit/53b1f9adcc5882838161d3aa628…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-02-12 (Fri, 12 Feb 2016)
Changed paths:
M ChangeLog
M changelog.php
M import.php
M libraries/Config.class.php
M libraries/File.class.php
M libraries/export.lib.php
M libraries/file_listing.lib.php
M libraries/plugins/import/ImportShp.class.php
M license.php
M prefs_manage.php
M setup/lib/index.lib.php
Log Message:
-----------
Silent errors on checking for files and folders
Fixes #11951
Fixes #11952
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 0c34cb60a03b4c429cdb29664202076da840dd53
https://github.com/phpmyadmin/phpmyadmin/commit/0c34cb60a03b4c429cdb2966420…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-02-12 (Fri, 12 Feb 2016)
Changed paths:
M ChangeLog
M changelog.php
M import.php
M libraries/Config.php
M libraries/File.php
M libraries/export.lib.php
M libraries/file_listing.lib.php
M libraries/plugins/import/ImportShp.php
M license.php
M prefs_manage.php
M setup/lib/index.lib.php
Log Message:
-----------
Merge branch 'QA_4_5' into QA_4_6
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/1894e33753c7...0c34cb60a03b