Merge pull request #491 from dlobo/MiscFixes

send right number of parameters to function

CRM/Core/Invoke.php

@@ -460,6 +460,7 @@ class CRM_Core_Invoke {
 
     CRM_Core_BAO_SETTING::updateSettingsFromMetaData();
     CRM_Core_Resources::singleton()->resetCacheCode();
+
     // also rebuild triggers if requested explicitly
     if (
       $triggerRebuild ||

CRM/Upgrade/Form.php

@@ -625,7 +625,7 @@ SET    version = '$version'
 
     // cleanup caches CRM-8739
     $config = CRM_Core_Config::singleton();
-    $config->cleanupCaches(1, FALSE);
+    $config->cleanupCaches(1);
 
     // Rebuild all triggers and re-enable logging if needed
     $logging = new CRM_Logging_Schema();