projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure headers are set correctly for json output
[civicrm-core.git]
/
CRM
/
Admin
/
Page
/
MailSettings.php
diff --git
a/CRM/Admin/Page/MailSettings.php
b/CRM/Admin/Page/MailSettings.php
index b3c2fceff8bccbbd94207b59fbcc1262faf361dc..f7460c958e64a49a1fa5a381815a9b231ab5160a 100644
(file)
--- a/
CRM/Admin/Page/MailSettings.php
+++ b/
CRM/Admin/Page/MailSettings.php
@@
-39,7
+39,7
@@
class CRM_Admin_Page_MailSettings extends CRM_Core_Page_Basic {
public $useLivePageJS = TRUE;
class CRM_Admin_Page_MailSettings extends CRM_Core_Page_Basic {
public $useLivePageJS = TRUE;
-
+
/**
* The action links that we need to display for the browse screen
*
/**
* The action links that we need to display for the browse screen
*
@@
-151,6
+151,8
@@
class CRM_Admin_Page_MailSettings extends CRM_Core_Page_Basic {
/**
* Get user context.
*
/**
* Get user context.
*
+ * @param null $mode
+ *
* @return string user context.
*/
function userContext($mode = NULL) {
* @return string user context.
*/
function userContext($mode = NULL) {