2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fa79bb39..648854a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@ Improvements:
 
 Bug fixes:
 
+* Fix compatibility issue with PHP 5.3 for array_combine function
 * Fix wrong controller name on project activity page when using filters
 
 Version 1.0.35 (Dec 4, 2016)
diff --git a/app/Core/ExternalTask/ExternalTaskManager.php b/app/Core/ExternalTask/ExternalTaskManager.php
index dac0fde7..102ec459 100644
--- a/app/Core/ExternalTask/ExternalTaskManager.php
+++ b/app/Core/ExternalTask/ExternalTaskManager.php
@@ -48,8 +48,11 @@ class ExternalTaskManager
     public function getProvidersList()
     {
         $providers = array_keys($this->providers);
+
         if (count($providers)) {
             return array_combine($providers, $providers);
         }
+
+        return array();
     }
 }