CRM-17686 extension disable fix, tpl improvement

diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php
index d2628f6620490f66af0d8e9df94e3d614e2e2da7..061913b9afc3eb7a3c280d9e90c5649bd7f80469 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -381,7 +381,12 @@ FROM `civicrm_dashboard_contact` WHERE 1 GROUP BY contact_id";
    * @return bool
    */
   public function disableFlexibleJobsExtension(CRM_Queue_TaskContext $ctx) {
-    civicrm_api3('Extension', 'disable', array('key' => 'com.klangsoft.flexiblejobs'));
+    try {
+      civicrm_api3('Extension', 'disable', array('key' => 'com.klangsoft.flexiblejobs'));
+    }
+    catch (CiviCRM_API3_Exception $e) {
+      // just ignore if the extension isn't installed
+    }
 
     return TRUE;
   }

diff --git a/templates/CRM/Admin/Form/Job.tpl b/templates/CRM/Admin/Form/Job.tpl
index ca95cdf714c2db7378d2ce279551fde59ddc301a..7d04c17cd805d96c8d247b0ffeda30ae002bb93d 100644 (file)
--- a/templates/CRM/Admin/Form/Job.tpl
+++ b/templates/CRM/Admin/Form/Job.tpl
@@ -109,7 +109,7 @@ CRM.$(function($) {
         <td class="label">{$form.scheduled_run_date.label}</td>
         <td>{$form.scheduled_run_date.html}<br />
             <div dlass="description">{ts}Do not run this job before this date / time. The run frequency selected above will apply thereafter.{/ts}<br />
-              {ts}Leave blank to run{/ts} {if $action eq 1}{ts}as soon as possible{/ts}{else}{ts}at next run frequency{/ts}{/if}.
+              {if $action eq 1}{ts}Leave blank to run as soon as possible.{/ts}{else}{ts}Leave blank to run at next run frequency.{/ts}{/if}
             </div>
         </td>
     </tr>