Merge pull request #3146 from mepps/fix-prepopulate-send-email

[civicrm-core.git] / CRM / Admin / Form / Preferences / Address.php

diff --git a/CRM/Admin/Form/Preferences/Address.php b/CRM/Admin/Form/Preferences/Address.php
index 08bff1409e9fc2c33c09f4fc8d56889bc91be48d..97bc6a4ec91b695b9d40f0c2a8833fa4649aa8fb 100644 (file)
--- a/CRM/Admin/Form/Preferences/Address.php
+++ b/CRM/Admin/Form/Preferences/Address.php
@@ -208,11 +208,8 @@ FROM   civicrm_county
 ";
           $countyCount = CRM_Core_DAO::singleValueQuery($sql);
           if ($countyCount < 10) {
-            global $civicrm_root;
-            $sqlFilePath = $civicrm_root . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR . 'counties.US.sql.gz';
-
-            CRM_Core_Session::setStatus("", ts('You have enabled the County option. Please ensure you populate the county table in your CiviCRM Database. You can find a list of US counties (in gzip format) in your distribution at: <em>%1</em>',
-              array(1 => $sqlFilePath)),
+            CRM_Core_Session::setStatus(ts('You have enabled the County option. Please ensure you populate the county table in your CiviCRM Database. You can find extensions to populate counties in the ') . CRM_Utils_System::href(ts('CiviCRM Extensions Directory'), 'civicrm/admin/extensions', array('reset' => 1), TRUE, 'extensions-addnew'),
+              ts('Populate counties'),
               "info"
             );
           }