[VD:Dropbox] fix Studio-42#1277 correction to composer autoloader

vvzh · Mar 22, 2016 · 97f98de · 97f98de
1 parent d86d948
commit 97f98de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -29,9 +29,7 @@
     },
     "suggest": {
         "dropbox-php/dropbox-php": "elFinder Volume driver `Dropbox` require `dropbox-php/dropbox-php`.",
-        "pear/auth": "dropbox-php require `pear/auth` or `PHP OAuth extension`.",
-        "pear/http_request2": "dropbox-php require `pear/http_request2` or `PHP OAuth extension`.",
-        "pear/net_url2": "dropbox-php require `pear/net_url2` or `PHP OAuth extension`.",
+        "pear/http_oauth": "dropbox-php require `pear/http_oauth` or `PHP OAuth extension`.",
         "barryvdh/elfinder-flysystem-driver": "VolumeDriver for elFinder to use Flysystem as a root."
     },
     "autoload": {

diff --git a/php/elFinderVolumeDropbox.class.php b/php/elFinderVolumeDropbox.class.php
@@ -148,7 +148,7 @@ public function netmountPrepare($options) {
 				if (class_exists('OAuth', false)) {
 					$this->oauth = new Dropbox_OAuth_PHP($options['consumerKey'], $options['consumerSecret']);
 				} else {
-					if (! class_exists('HTTP_OAuth_Consumer', false)) {
+					if (! class_exists('HTTP_OAuth_Consumer')) {
 						// We're going to try to load in manually
 						include 'HTTP/OAuth/Consumer.php';
 					}
@@ -311,7 +311,7 @@ protected function init() {
 				if (class_exists('OAuth', false)) {
 					$this->oauth = new Dropbox_OAuth_PHP($this->options['consumerKey'], $this->options['consumerSecret']);
 				} else {
-					if (! class_exists('HTTP_OAuth_Consumer', false)) {
+					if (! class_exists('HTTP_OAuth_Consumer')) {
 						// We're going to try to load in manually
 						include 'HTTP/OAuth/Consumer.php';
 					}