From 9327d839e4ac1df01cbe4e9f3a6b96d6b308dddf Mon Sep 17 00:00:00 2001 From: "Donald A. Lobo" Date: Sun, 5 May 2013 08:36:56 -0700 Subject: [PATCH] CRM-12533 ---------------------------------------- * CRM-12533: Wrong help text CRM/Core/Config.php: http://issues.civicrm.org/jira/browse/CRM-12533 --- CRM/Core/Config.php | 16 ++++++++-------- templates/CRM/Event/Page/ManageEvent.hlp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php index 07752d85eb..6ee9c2f7b1 100644 --- a/CRM/Core/Config.php +++ b/CRM/Core/Config.php @@ -518,8 +518,8 @@ class CRM_Core_Config extends CRM_Core_Config_Variables { } elseif ($mailingInfo['outBound_option'] == CRM_Mailing_Config::OUTBOUND_OPTION_SMTP) { if ($mailingInfo['smtpServer'] == '' || !$mailingInfo['smtpServer']) { - CRM_Core_Error::debug_log_message(ts('There is no valid smtp server setting. Click Administer CiviCRM >> Global Settings to set the SMTP Server.', array(1 => CRM_Utils_System::url('civicrm/admin/setting', 'reset=1')))); - CRM_Core_Error::fatal(ts('There is no valid smtp server setting. Click Administer CiviCRM >> Global Settings to set the SMTP Server.', array(1 => CRM_Utils_System::url('civicrm/admin/setting', 'reset=1')))); + CRM_Core_Error::debug_log_message(ts('There is no valid smtp server setting. Click Administer >> System Setting >> Outbound Email to set the SMTP Server.', array(1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')))); + CRM_Core_Error::fatal(ts('There is no valid smtp server setting. Click Administer >> System Setting >> Outbound Email to set the SMTP Server.', array(1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')))); } $params['host'] = $mailingInfo['smtpServer'] ? $mailingInfo['smtpServer'] : 'localhost'; @@ -550,8 +550,8 @@ class CRM_Core_Config extends CRM_Core_Config_Variables { if ($mailingInfo['sendmail_path'] == '' || !$mailingInfo['sendmail_path'] ) { - CRM_Core_Error::debug_log_message(ts('There is no valid sendmail path setting. Click Administer CiviCRM >> Global Settings to set the Sendmail Server.', array(1 => CRM_Utils_System::url('civicrm/admin/setting', 'reset=1')))); - CRM_Core_Error::fatal(ts('There is no valid sendmail path setting. Click Administer CiviCRM >> Global Settings to set the Sendmail Server.', array(1 => CRM_Utils_System::url('civicrm/admin/setting', 'reset=1')))); + CRM_Core_Error::debug_log_message(ts('There is no valid sendmail path setting. Click Administer >> System Setting >> Outbound Email to set the sendmail server.', array(1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')))); + CRM_Core_Error::fatal(ts('There is no valid sendmail path setting. Click Administer >> System Setting >> Outbound Email to set the sendmail server.', array(1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')))); } $params['sendmail_path'] = $mailingInfo['sendmail_path']; $params['sendmail_args'] = $mailingInfo['sendmail_args']; @@ -566,12 +566,12 @@ class CRM_Core_Config extends CRM_Core_Config_Variables { self::$_mail = Mail::factory('mock', $params); } elseif ($mailingInfo['outBound_option'] == 2) { - CRM_Core_Error::debug_log_message(ts('Outbound mail has been disabled. Click Administer CiviCRM >> Global Settings to set the OutBound Email.', array(1 => CRM_Utils_System::url('civicrm/admin/setting', 'reset=1')))); - CRM_Core_Session::setStatus(ts('Outbound mail has been disabled. Click Administer CiviCRM >> Global Settings to set the OutBound Email.', array(1 => CRM_Utils_System::url('civicrm/admin/setting', 'reset=1')))); + CRM_Core_Error::debug_log_message(ts('Outbound mail has been disabled. Click Administer >> System Setting >> Outbound Email to set the OutBound Email.', array(1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')))); + CRM_Core_Session::setStatus(ts('Outbound mail has been disabled. Click Administer >> System Setting >> Outbound Email to set the OutBound Email.', array(1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')))); } else{ - CRM_Core_Error::debug_log_message(ts('There is no valid SMTP server Setting Or SendMail path setting. Click Administer CiviCRM >> Global Settings to set the OutBound Email.', array(1 => CRM_Utils_System::url('civicrm/admin/setting', 'reset=1')))); - CRM_Core_Session::setStatus(ts('There is no valid SMTP server Setting Or SendMail path setting. Click Administer CiviCRM >> Global Settings to set the OutBound Email.', array(1 => CRM_Utils_System::url('civicrm/admin/setting', 'reset=1')))); + CRM_Core_Error::debug_log_message(ts('There is no valid SMTP server Setting Or SendMail path setting. Click Administer >> System Setting >> Outbound Email to set the OutBound Email.', array(1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')))); + CRM_Core_Session::setStatus(ts('There is no valid SMTP server Setting Or sendMail path setting. Click Administer >> System Setting >> Outbound Email to set the OutBound Email.', array(1 => CRM_Utils_System::url('civicrm/admin/setting/smtp', 'reset=1')))); CRM_Core_Error::debug_var('mailing_info', $mailingInfo); } } diff --git a/templates/CRM/Event/Page/ManageEvent.hlp b/templates/CRM/Event/Page/ManageEvent.hlp index 4cba1cd55f..cafe54168a 100644 --- a/templates/CRM/Event/Page/ManageEvent.hlp +++ b/templates/CRM/Event/Page/ManageEvent.hlp @@ -47,7 +47,7 @@

{ts}By default, both methods get all events whose starting date is greater than or equal to the current date. However, you can modify this by passing additional parameters in the URL:{/ts}

{ts}EXAMPLE: Given the default event types, this URL will retrieve all events with start dates on or after January 1, 2007 whose event type is 'Fundraiser':{/ts}

-- 
2.25.1