Merge pull request #6188 from MrPetovan/bug/5928-protect-oauthexception

Protect OAuthException declaration to avoid conflict with php-pecl-oauth
2018-11-23 07:09:49 +01:00 · 2018-11-23 07:09:49 +01:00 · 52b342a90c
parent a58ee97ba4 6fd294aac5
commit 52b342a90c
1 changed files with 4 additions and 2 deletions
--- a/library/OAuth1.php
+++ b/library/OAuth1.php
@ -3,8 +3,10 @@

 /* Generic exception class
 */
-class OAuthException extends Exception {
-  // pass
+if (!class_exists('OAuthException', false)) {
+  class OAuthException extends Exception {
+    // pass
+  }
 }

 class OAuthConsumer {