Merge pull request #334 from loadedcommerce/B1933

B1933
loadedcommerce · Dec 6, 2013 · 1d804d7 · 1d804d7
2 parents 73b5839 + 6b63a72
commit 1d804d7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/catalog/admin/includes/application_top.php b/catalog/admin/includes/application_top.php
@@ -20,6 +20,11 @@
 ini_set('log_errors', true);
 ini_set('error_log', DIR_FS_WORK . 'php_errors.log');
 
+// added for missing date.timezone in global php.ini
+if (!ini_get('date.timezone') && function_exists(date_default_timezone_set)) {
+   date_default_timezone_set('GMT');
+}
+
 // virtual hook system
 require_once('external/vqmod/vqmod.php');
 $lC_Vqmod = new VQMod();

diff --git a/catalog/admin/includes/applications/orders/classes/orders.php b/catalog/admin/includes/applications/orders/classes/orders.php
@@ -860,7 +860,7 @@ public static function get12HourTime($datetime) {
   */
   public static function getTextDate($datetime) {
     $date = substr(lC_DateTime::getShort($datetime, true), 0, -8);
-    return date("M jS Y", strtotime($date));
+    return @date("M jS Y", @strtotime($date));
   }
  /*
   * Return the orders transaction history

diff --git a/catalog/admin/includes/modules/summary/revenue.php b/catalog/admin/includes/modules/summary/revenue.php
@@ -43,10 +43,10 @@ protected function _setData() {
       require_once($lC_Vqmod->modCheck('../includes/classes/currencies.php'));
       $lC_Currencies = new lC_Currencies();
 
-      $lastMonth = date("m",strtotime("-1 month"));
-      $currentDay = date("d");
-      $currentMonth = date("m");
-      $currentYear = date("Y");
+      $lastMonth = @date("m", @strtotime("-1 month"));
+      $currentDay = @date("d");
+      $currentMonth = @date("m");
+      $currentYear = @date("Y");
 
       $Qorders = $lC_Database->query('select o.orders_id, ot.value as order_total, greatest(o.date_purchased, ifnull(o.last_modified, "1970-01-01")) as date_last_modified from :table_orders o, :table_orders_total ot where o.orders_id = ot.orders_id and ot.class = "total" order by date_last_modified desc limit 6');
       $Qorders->bindTable(':table_orders', TABLE_ORDERS);