projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4621 from atif-shaikh/CRM-15589
[civicrm-core.git]
/
CRM
/
Utils
/
VersionCheck.php
diff --git
a/CRM/Utils/VersionCheck.php
b/CRM/Utils/VersionCheck.php
index bcdc3a4b7374e2b6fb436b51329149bb97435301..cf9c9399b51a06b9f01fe07bfbf5391864b713e6 100644
(file)
--- a/
CRM/Utils/VersionCheck.php
+++ b/
CRM/Utils/VersionCheck.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
3
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id: $
*
*/
* $Id: $
*
*/
@@
-165,7
+165,8
@@
class CRM_Utils_VersionCheck {
*/
public function newerVersion() {
if ($this->latestVersion) {
*/
public function newerVersion() {
if ($this->latestVersion) {
- if (version_compare($this->localVersion, $this->latestVersion) < 0) {
+ if ((version_compare($this->localVersion, $this->latestVersion) < 0)
+ && CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'versionAlert', NULL, TRUE)) {
return $this->latestVersion;
}
}
return $this->latestVersion;
}
}