From bec7ba8ca29a794a05a69113581446b80b9e65c5 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Thu, 10 Oct 2019 11:56:11 +0530
Subject: [PATCH] Fixes #1178 ::Uma::split api is been replaced with preg_split
---
include/utils/VtlibUtils.php | 12 ++++++++++++
modules/Reports/views/Detail.php | 12 +++++++-----
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/include/utils/VtlibUtils.php b/include/utils/VtlibUtils.php
index dbf16efb0..3a198fe23 100644
--- a/include/utils/VtlibUtils.php
+++ b/include/utils/VtlibUtils.php
@@ -827,4 +827,16 @@ function vtlib_addSettingsLink($linkName, $linkURL, $blockName = false) {
return $success;
}
+/**
+ * PHP7 support for split function
+ * split : Case sensitive.
+ */
+if (!function_exists('split')) {
+ function split($pattern, $string, $limit = null) {
+ $regex = '/' . preg_replace('/\//', '\\/', $pattern) . '/';
+ return preg_split($regex, $string, $limit);
+ }
+
+}
+
?>
\ No newline at end of file
diff --git a/modules/Reports/views/Detail.php b/modules/Reports/views/Detail.php
index 08b8fabdf..df34ff09e 100644
--- a/modules/Reports/views/Detail.php
+++ b/modules/Reports/views/Detail.php
@@ -66,11 +66,13 @@ class Reports_Detail_View extends Vtiger_Index_View {
$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(!empty($secondaryModules)){
+ if(stripos($secondaryModules, ':') >= 0){
+ $secmodules = split(':', $secondaryModules);
+ $modulesList = array_merge($modulesList, $secmodules);
+ }else{
+ array_push($modulesList, $secondaryModules);
+ }
}
$currentUser = Users_Record_Model::getCurrentUserModel();
$userPrivilegesModel = Users_Privileges_Model::getInstanceById($currentUser->getId());
--
GitLab