Merge pull request #4003 from civicrm/4.5

[civicrm-core.git] / CRM / Admin / Page / Options.php

diff --git a/CRM/Admin/Page/Options.php b/CRM/Admin/Page/Options.php
index 31788c7eba0a93ca55ce1d3bc90e95bd5fdc17f4..efdba99f13c0bb76982a9ffd0613f4fa3a581c02 100644 (file)
--- a/CRM/Admin/Page/Options.php
+++ b/CRM/Admin/Page/Options.php
@@ -143,7 +143,7 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic {
           'communication_style',
           'case_status', 'encounter_medium',
           'case_type', 'payment_instrument',
-          'soft_credit_type'
+          'soft_credit_type', 'website_type'
         )
       )) {
       $this->assign('showIsDefault', TRUE);
@@ -281,6 +281,8 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic {
   /**
    * Get user context.
    *
+   * @param null $mode
+   *
    * @return string user context.
    */
   function userContext($mode = NULL) {