revert rcmail_oauth change - fixed in plugin installer

roundcube · Apr 10, 2024 · 5def9b3 · 5def9b3
1 parent 91efb0f
commit 5def9b3
Showing 1 changed file with 4 additions and 21 deletions.
diff --git a/program/include/rcmail_oauth.php b/program/include/rcmail_oauth.php
@@ -200,27 +200,10 @@ public function __construct($options = [])
         }
 
         // prepare a http client with the correct options
-        if (class_exists(HttpClient::class)) { // class is not autoloaded in "roundcube/plugin-installer" composer plugin on the first/clean composer install
-            /*
-             * [Error] Class 'GuzzleHttp\Client' not found
-             *
-             * Exception trace:
-             *   at program\lib\Roundcube\rcube.php:277
-             *  rcube->get_http_client() at program\include\rcmail_oauth.php:205
-             *  rcmail_oauth->__construct() at program\include\rcmail_oauth.php:104
-             *  rcmail_oauth::get_instance() at program\include\rcmail.php:150
-             *  rcmail->startup() at program\include\rcmail.php:88
-             *  rcmail::get_instance() at program\include\clisetup.php:30
-             *  include_once() at vendor\roundcube\plugin-installer\src\Roundcube\Composer\ExtensionInstaller.php:49
-             *  Roundcube\Composer\ExtensionInstaller->install() at composer.phar/src/Composer/Installer/InstallationManager.php:463
-             *  Composer\Installer\InstallationManager->install() at composer.phar/src/Composer/Installer/InstallationManager.php:378
-             */
-
-            $this->http_client = $this->rcmail->get_http_client((array) $options['http_options'] + [
-                'timeout' => $this->options['timeout'],
-                'verify' => $this->options['verify_peer'],
-            ]);
-        }
+        $this->http_client = $this->rcmail->get_http_client((array) $options['http_options'] + [
+            'timeout' => $this->options['timeout'],
+            'verify' => $this->options['verify_peer'],
+        ]);
     }
 
     /**