X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FAdmin%2FPage%2FLabelFormats.php;h=bdc26e9637a50baeb8c97337c588f7eb06bcb818;hb=02fc859b3146244f5f4f3c2c4d9ffce229e06d40;hp=5fe0483105b15aa81017ff9aa8917d2f6be5d638;hpb=3838662faff56daff7b4fbbd25c60a4b7242a484;p=civicrm-core.git

diff --git a/CRM/Admin/Page/LabelFormats.php b/CRM/Admin/Page/LabelFormats.php
index 5fe0483105..bdc26e9637 100644
--- a/CRM/Admin/Page/LabelFormats.php
+++ b/CRM/Admin/Page/LabelFormats.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright (C) 2011 Marty Wright                                    |
  | Licensed to CiviCRM under the Academic Free License version 3.0.   |
@@ -54,7 +54,7 @@ class CRM_Admin_Page_LabelFormats extends CRM_Core_Page_Basic {
    *
    * @return string Classname of BAO.
    */
-  function getBAOName() {
+  public function getBAOName() {
     return 'CRM_Core_BAO_LabelFormat';
   }
 
@@ -63,7 +63,7 @@ class CRM_Admin_Page_LabelFormats extends CRM_Core_Page_Basic {
    *
    * @return array (reference) of action links
    */
-  function &links() {
+  public function &links() {
     if (!(self::$_links)) {
       // helper variable for nicer formatting
       self::$_links = array(
@@ -96,7 +96,7 @@ class CRM_Admin_Page_LabelFormats extends CRM_Core_Page_Basic {
    *
    * @return string Classname of edit form.
    */
-  function editForm() {
+  public function editForm() {
     return 'CRM_Admin_Form_LabelFormats';
   }
 
@@ -105,7 +105,7 @@ class CRM_Admin_Page_LabelFormats extends CRM_Core_Page_Basic {
    *
    * @return string name of this page.
    */
-  function editName() {
+  public function editName() {
     return 'Mailing Label Formats';
   }
 
@@ -116,7 +116,7 @@ class CRM_Admin_Page_LabelFormats extends CRM_Core_Page_Basic {
    *
    * @return string user context.
    */
-  function userContext($mode = NULL) {
+  public function userContext($mode = NULL) {
     return 'civicrm/admin/labelFormats';
   }
 
@@ -126,13 +126,12 @@ class CRM_Admin_Page_LabelFormats extends CRM_Core_Page_Basic {
    * @param null $action
    *
    * @return void
-   * @access public
    * @static
    */
-  function browse($action = NULL) {
+  public function browse($action = NULL) {
     // Get list of configured Label Formats
-    $labelFormatList= CRM_Core_BAO_LabelFormat::getList();
-    $nameFormatList= CRM_Core_BAO_LabelFormat::getList(false, 'name_badge');
+    $labelFormatList = CRM_Core_BAO_LabelFormat::getList();
+    $nameFormatList = CRM_Core_BAO_LabelFormat::getList(FALSE, 'name_badge');
 
     // Add action links to each of the Label Formats
     foreach ($labelFormatList as & $format) {
@@ -166,4 +165,3 @@ class CRM_Admin_Page_LabelFormats extends CRM_Core_Page_Basic {
     $this->assign('rows', $labelFormatList);
   }
 }
-