From 9f9ed9285075989c03d532d4f0af0604675ca717 Mon Sep 17 00:00:00 2001 From: atif-shaikh Date: Wed, 11 Mar 2015 10:58:19 +0530 Subject: [PATCH] CRM-14199 - Minor Warning Fix ---------------------------------------- * CRM-14199: Incorrect Math in Import routines https://issues.civicrm.org/jira/browse/CRM-14199 --- CRM/Core/Config/Defaults.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Core/Config/Defaults.php b/CRM/Core/Config/Defaults.php index a5123237dd..57a155c58a 100644 --- a/CRM/Core/Config/Defaults.php +++ b/CRM/Core/Config/Defaults.php @@ -99,7 +99,7 @@ class CRM_Core_Config_Defaults { CRM_Core_Session::setStatus(ts("Note: Upload max filesize ('upload_max_filesize') should not exceed Post max size ('post_max_size') as defined in PHP.ini, please check with your system administrator."), ts("Warning"), "alert"); } //respect php.ini upload_max_filesize - if ($size > $maxImportFileSize) { + if ($size > $maxImportFileSize && $size !== $postMaxSize) { $size = $maxImportFileSize; CRM_Core_Session::setStatus(ts("Note: Please verify your configuration for Maximum File Size (in MB) Administrator >> System Settings >> Misc. It should support 'upload_max_size' as defined in PHP.ini.Please check with your system administrator.", array(1 => CRM_Utils_System::url('civicrm/admin/setting/misc', 'reset=1'))), ts("Warning"), "alert"); } -- 2.25.1