Cleanup phpdoc comments

[civicrm-core.git] / CRM / Utils / VersionCheck.php

diff --git a/CRM/Utils/VersionCheck.php b/CRM/Utils/VersionCheck.php
index f94487cdda995608360b96557ae5dca7b211f2e1..cf9c9399b51a06b9f01fe07bfbf5391864b713e6 100644 (file)
--- a/CRM/Utils/VersionCheck.php
+++ b/CRM/Utils/VersionCheck.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id: $
  *
  */
@@ -165,7 +165,8 @@ class CRM_Utils_VersionCheck {
    */
   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;
       }
     }
@@ -224,7 +225,7 @@ class CRM_Utils_VersionCheck {
       'CRM_Contribute_DAO_ContributionProduct' => NULL,
       'CRM_Contribute_DAO_Widget' => 'is_active = 1',
       'CRM_Core_DAO_Discount' => NULL,
-      'CRM_Price_DAO_SetEntity' => NULL,
+      'CRM_Price_DAO_PriceSetEntity' => NULL,
       'CRM_Core_DAO_UFGroup' => 'is_active = 1',
       'CRM_Event_DAO_Event' => 'is_active = 1',
       'CRM_Event_DAO_Participant' => 'is_test = 0',