Merge pull request #10055 from emrebass/patch-1

Fix for 'ee.listeners' error
Automattic · Mar 24, 2021 · 9e98cd8 · 9e98cd8
2 parents 1c20044 + 1629e4b
commit 9e98cd8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/helpers/promiseOrCallback.js b/lib/helpers/promiseOrCallback.js
@@ -8,7 +8,7 @@ module.exports = function promiseOrCallback(callback, fn, ee, Promise) {
   if (typeof callback === 'function') {
     return fn(function(error) {
       if (error != null) {
-        if (ee != null && ee.listeners('error').length > 0 && !error[emittedSymbol]) {
+        if (ee != null && ee.listeners != null && ee.listeners('error').length > 0 && !error[emittedSymbol]) {
           error[emittedSymbol] = true;
           ee.emit('error', error);
         }
@@ -30,7 +30,7 @@ module.exports = function promiseOrCallback(callback, fn, ee, Promise) {
   return new Promise((resolve, reject) => {
     fn(function(error, res) {
       if (error != null) {
-        if (ee != null && ee.listeners('error').length > 0 && !error[emittedSymbol]) {
+        if (ee != null && ee.listeners != null && ee.listeners('error').length > 0 && !error[emittedSymbol]) {
           error[emittedSymbol] = true;
           ee.emit('error', error);
         }
@@ -42,4 +42,4 @@ module.exports = function promiseOrCallback(callback, fn, ee, Promise) {
       resolve(res);
     });
   });
-};
+};