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 37dcf2b549535d1027a43435e0d139ae44a38453..f7460c958e64a49a1fa5a381815a9b231ab5160a 100644
(file)
--- a/
CRM/Admin/Page/MailSettings.php
+++ b/
CRM/Admin/Page/MailSettings.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | 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$
*
*/
@@
-38,6
+38,8
@@
*/
class CRM_Admin_Page_MailSettings extends CRM_Core_Page_Basic {
*/
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
*
@@
-149,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) {