proposed changes for CRM-16871

diff --git a/api/v3/Job.php b/api/v3/Job.php
index c6a27618e4b6d9f17fde80bf6aebc03271f4612d..9c8dc356de0bee5de370149460cc682e59348812 100644 (file)
--- a/api/v3/Job.php
+++ b/api/v3/Job.php
@@ -568,6 +568,8 @@ function civicrm_api3_job_cleanup($params) {
   $prevNext  = CRM_Utils_Array::value('prevNext', $params, TRUE);
   $dbCache   = CRM_Utils_Array::value('dbCache', $params, FALSE);
   $memCache  = CRM_Utils_Array::value('memCache', $params, FALSE);
+  $tplCache  = CRM_Utils_Array::value('tplCache' , $params, FALSE );
+  $wordRplc  = CRM_Utils_Array::value('wordRplc' , $params, FALSE );
 
   if ($session || $tempTable || $prevNext) {
     CRM_Core_BAO_Cache::cleanup($session, $tempTable, $prevNext);
@@ -577,6 +579,11 @@ function civicrm_api3_job_cleanup($params) {
     CRM_Core_BAO_Job::cleanup();
   }
 
+  if ( $tplCache ) {
+    $config = CRM_Core_Config::singleton();
+    $config->cleanup(1, FALSE);
+  }
+
   if ($dbCache) {
     CRM_Core_Config::clearDBCache();
   }
@@ -584,6 +591,10 @@ function civicrm_api3_job_cleanup($params) {
   if ($memCache) {
     CRM_Utils_System::flushCache();
   }
+
+  if ( $wordRplc ) {
+    CRM_Core_BAO_WordReplacement::rebuild();
+  }
 }
 
 /**