Merge pull request #4818 from pratikshad/CRM-15770

[civicrm-core.git] / CRM / Core / JobManager.php

diff --git a/CRM/Core/JobManager.php b/CRM/Core/JobManager.php
index c1473b41da671dae20b28cfbbcc7dd38bc5425e5..87f31061ab2339b39113561c2ea0d97912c5d144 100644 (file)
--- a/CRM/Core/JobManager.php
+++ b/CRM/Core/JobManager.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -55,7 +55,6 @@ class CRM_Core_JobManager {
    * Class constructor
    *
    * @param void
-   * @access public
    *
    */
   /**
@@ -71,7 +70,6 @@ class CRM_Core_JobManager {
   /*
    *
    * @param void
-   * @access private
    *
    */
   /**
@@ -102,7 +100,6 @@ class CRM_Core_JobManager {
    * Class destructor
    *
    * @param void
-   * @access public
    *
    */
   public function __destruct() {}
@@ -117,7 +114,7 @@ class CRM_Core_JobManager {
   }
 
   /**
-   * @param $id
+   * @param int $id
    */
   public function executeJobById($id) {
     $job = $this->_getJob($id);
@@ -157,7 +154,6 @@ class CRM_Core_JobManager {
    *
    * @param void
    * @return array ($id => CRM_Core_ScheduledJob)
-   * @access private
    *
    */
   /**
@@ -182,11 +178,10 @@ class CRM_Core_JobManager {
    * and creates ScheduledJob object.
    *
    * @param void
-   * @access private
    *
    */
   /**
-   * @param null $id
+   * @param int $id
    * @param null $entity
    * @param null $action
    *
@@ -225,7 +220,6 @@ class CRM_Core_JobManager {
   /*
    *
    * @return array|null collection of permissions, null if none
-   * @access public
    *
    */
   /**
@@ -243,7 +237,7 @@ class CRM_Core_JobManager {
     if ($this->currentJob) {
       $dao->job_id  = $this->currentJob->id;
       $dao->name    = $this->currentJob->name;
-      $dao->command = ts("Entity:") . " " + $this->currentJob->api_entity + " " . ts("Action:") . " " + $this->currentJob->api_action;
+      $dao->command = ts("Entity:") . " " . $this->currentJob->api_entity . " " . ts("Action:") . " " . $this->currentJob->api_action;
       $data         = "";
       if (!empty($this->currentJob->parameters)) {
         $data .= "\n\nParameters raw (from db settings): \n" . $this->currentJob->parameters;
@@ -292,4 +286,3 @@ class CRM_Core_JobManager {
 function CRM_Core_JobManager_scheduledJobFatalErrorHandler($message) {
   throw new Exception("{$message['message']}: {$message['code']}");
 }
-