<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
$dateOptions = array();
- if (CRM_Utils_System::getClassName($form) == 'CRM_Activity_Import_Form_UploadFile') {
+ if (CRM_Utils_System::getClassName($form) == 'CRM_Activity_Import_Form_DataSource') {
$dateText = ts('yyyy-mm-dd OR yyyy-mm-dd HH:mm OR yyyymmdd OR yyyymmdd HH:mm (1998-12-25 OR 1998-12-25 15:33 OR 19981225 OR 19981225 10:30 OR ( 2008-9-1 OR 2008-9-1 15:33 OR 20080901 15:33)');
}
else {
'earlier.month' => ts('To End of Prior Month'),
'earlier.week' => ts('To End of Prior Week'),
'earlier.day' => ts('To End of Prior Day'),
- 'greater.year' => ts('Current Year to-date'),
- 'greater.quarter' => ts('Current Quarter to-date'),
- 'greater.month' => ts('Current Month to-date'),
- 'greater.week' => ts('Current Week to-date'),
- 'greater.day' => ts('Current Day'),
- 'ending.year' => ts('From 12 Months Ago'),
- 'ending.quarter' => ts('From 3 Months Ago'),
- 'ending.month' => ts('From 1 Month Ago'),
- 'ending.week' => ts('From 1 Week Ago'),
+ 'greater.year' => ts('From Start of Current Year'),
+ 'greater.quarter' => ts('From Start of Current Quarter'),
+ 'greater.month' => ts('From Start of Current Month'),
+ 'greater.week' => ts('From Start of Current Week'),
+ 'greater.day' => ts('From Start of Current Day'),
+ 'current.year' => ts('Current Year to-date'),
+ 'current.quarter' => ts('Current Quarter to-date'),
+ 'current.month' => ts('Current Month to-date'),
+ 'current.week' => ts('Current Week to-date'),
+ 'ending_3.year' => ts('Last 3 Years'),
+ 'ending_2.year' => ts('Last 2 Years'),
+ 'ending.year' => ts('Last 12 Months'),
+ 'ending.quarter' => ts('Last 3 Months'),
+ 'ending.month' => ts('Last Month'),
+ 'ending.week' => ts('Last 7 days'),
);
- $selector = array_merge($selector, $operators);
+
+ if (is_array($operators)) {
+ $selector = array_merge($selector, $operators);
+ }
$config = CRM_Core_Config::singleton();
//if fiscal year start on 1 jan then remove fiscal year task