Merge pull request #12974 from ibennetch/autoload-error-QA_4_7

Better error message when Composer files are missing.
phpmyadmin · Feb 9, 2017 · 049382b · 049382b
2 parents 99e4e0d + 8db5de0
commit 049382b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog
 - issue #12954 Fixed export of tracking data
 - issue #12960 Enclose exports in transaction by default
 - issue #12966 After adding a column ADD INDEX option won't be displayed when enabling AI
+- issue #12972 Better error message when Composer has not been run
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

diff --git a/libraries/common.inc.php b/libraries/common.inc.php
@@ -75,6 +75,13 @@
 /**
  * Activate autoloader
  */
+if (! @is_readable('./vendor/autoload.php')) {
+    die(
+        'File <tt>./vendor/autoload.php</tt> missing or not readable. <br />'
+        . 'Most likely you did not run Composer to '
+        . '<a href="https://docs.phpmyadmin.net/en/latest/setup.html#installing-from-git">install library files</a>.'
+    );
+}
 require_once './vendor/autoload.php';
 
 /**