From 4b7761f5c3d36fff3ac5f178ee4888384d76f1bf Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Thu, 28 Nov 2019 17:18:37 +0530
Subject: [PATCH] Fixes #1215 Export report with no secondary modules
---
modules/Reports/views/Detail.php | 2 +-
modules/Reports/views/ExportReport.php | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/modules/Reports/views/Detail.php b/modules/Reports/views/Detail.php
index df34ff09e..59acd44b0 100644
--- a/modules/Reports/views/Detail.php
+++ b/modules/Reports/views/Detail.php
@@ -68,7 +68,7 @@ class Reports_Detail_View extends Vtiger_Index_View {
$modulesList = array($primaryModule);
if(!empty($secondaryModules)){
if(stripos($secondaryModules, ':') >= 0){
- $secmodules = split(':', $secondaryModules);
+ $secmodules = explode(':', $secondaryModules);
$modulesList = array_merge($modulesList, $secmodules);
}else{
array_push($modulesList, $secondaryModules);
diff --git a/modules/Reports/views/ExportReport.php b/modules/Reports/views/ExportReport.php
index 997427fe1..0a2e9e1c8 100644
--- a/modules/Reports/views/ExportReport.php
+++ b/modules/Reports/views/ExportReport.php
@@ -92,11 +92,13 @@ class Reports_ExportReport_View extends Vtiger_View_Controller {
$primaryModule = $reportModel->getPrimaryModule();
$secondaryModules = $reportModel->getSecondaryModules();
$modulesList = array($primaryModule);
- if(stripos($secondaryModules, ':') >= 0){
- $secmodules = split(':', $secondaryModules);
- $modulesList = array_merge($modulesList, $secmodules);
- }else{
- array_push($modulesList, $secondaryModules);
+ if($secondaryModules){
+ if(stripos($secondaryModules, ':') >= 0){
+ $secmodules = explode(':', $secondaryModules);
+ $modulesList = array_merge($modulesList, $secmodules);
+ }else{
+ array_push($modulesList, $secondaryModules);
+ }
}
$currentUser = Users_Record_Model::getCurrentUserModel();
$userPrivilegesModel = Users_Privileges_Model::getInstanceById($currentUser->getId());
--
GitLab