Merge pull request #20 from C4K3/master

require phpbb's vendor/autoload.php, fix #19
Digitalroot-Technologies · Feb 2, 2017 · 96015c2 · 96015c2
2 parents c6cdb2c + 6ca9c80
commit 96015c2
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/Auth_phpbb.php b/Auth_phpbb.php
@@ -685,7 +685,14 @@ private function loadPHPFiles($FileSet)
                     throw new Exception('Unable to find phpbb\'s utf_tools.php file at (' . $this->_PathToPHPBB . '/includes/utf/utf_tools.php). Please check that phpBB is installed.');
                 }
 
+                // We need the composer autoloader because phpBB 3.2+ uses patchwork/utf.
+                if (!is_file($this->_PathToPHPBB . 'vendor/autoload.php'))
+                {
+                    throw new Exception('Unable to find phpbb\'s autoload.php file at (' . $this->_PathToPHPBB . '/vendor/autoload.php). Please check that phpBB is installed.');
+                }
+
                 // Load the phpBB file.
+                require_once $this->_PathToPHPBB . 'vendor/autoload.php';
                 require_once $this->_PathToPHPBB . 'includes/utf/utf_tools.php';
                 break;