Merge pull request #9259 from sqweets/customRelationshipsExport

[civicrm-core.git] / sql / GenerateReportData.php

diff --git a/sql/GenerateReportData.php b/sql/GenerateReportData.php
index 23d0965c6140787d165bee532c7fbacf8333b4a2..fe5fbe3d7d9fc6df0a96916fa9bc4812f2ff695d 100644 (file)
--- a/sql/GenerateReportData.php
+++ b/sql/GenerateReportData.php
@@ -352,7 +352,7 @@ class CRM_GCD {
     // number of seconds for 2 year
     $numSecond = 63072000;
 
-    $dateFormat = "Ymdhis";
+    $dateFormat = "YmdHis";
     $today = time();
 
     // both are defined
@@ -383,7 +383,7 @@ class CRM_GCD {
   private function _insert(&$dao) {
     if (self::ADD_TO_DB) {
       if (!$dao->insert()) {
-        echo "ERROR INSERT: " . mysql_error() . "\n";
+        echo "ERROR INSERT: " . mysqli_error($dao->getConnection()->connection) . "\n";
         print_r($dao);
         exit(1);
       }
@@ -397,7 +397,7 @@ class CRM_GCD {
   private function _update($dao) {
     if (self::ADD_TO_DB) {
       if (!$dao->update()) {
-        echo "ERROR UPDATE: " . mysql_error() . "\n";
+        echo "ERROR UPDATE: " . mysqli_error($dao->getConnection()->connection) . "\n";
         print_r($dao);
         exit(1);
       }