From 73c2841457ad8cf324a044ffdaf4c1f6f4bf1311 Mon Sep 17 00:00:00 2001
From: Patrick Bihan-Faou <pbf@alumni.egroupware.org>
Date: Tue, 27 Nov 2007 17:23:40 +0000
Subject: [PATCH] Remove the reference to the deprecated formated_list()
 functions for categories. Replaced them with the correct name:
 formatted_list().

---
 admin/inc/class.bocategories.inc.php       | 2 +-
 phpgwapi/inc/class.categories.inc.php      | 7 -------
 phpgwapi/inc/class.nextmatchs.inc.php      | 4 ++--
 preferences/inc/class.bocategories.inc.php | 2 +-
 preferences/inc/class.uicategories.inc.php | 2 +-
 5 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/admin/inc/class.bocategories.inc.php b/admin/inc/class.bocategories.inc.php
index 75c29bc11c..a4119deee4 100644
--- a/admin/inc/class.bocategories.inc.php
+++ b/admin/inc/class.bocategories.inc.php
@@ -124,7 +124,7 @@
 
 		function formatted_list($data)
 		{
-			return $this->cats->formated_list($data['select'],$data['all'],$data['cat_parent'],True);
+			return $this->cats->formatted_list($data['select'],$data['all'],$data['cat_parent'],True);
 		}
 
 		function delete($cat_id,$subs=False)
diff --git a/phpgwapi/inc/class.categories.inc.php b/phpgwapi/inc/class.categories.inc.php
index 54f3504c23..69603826a5 100644
--- a/phpgwapi/inc/class.categories.inc.php
+++ b/phpgwapi/inc/class.categories.inc.php
@@ -449,13 +449,6 @@
 			}
 			return $s;
 		}
-		/**
-		 * @deprecated use formatted_list
-		 */
-		function formated_list($format,$type='',$selected = '',$globals = False,$site_link = 'site')
-		{
-			return $this->formatted_list($format,$type,$selected,$globals,$site_link);
-		}
 
 		/**
 		 * add a category
diff --git a/phpgwapi/inc/class.nextmatchs.inc.php b/phpgwapi/inc/class.nextmatchs.inc.php
index 2ddb3cca29..e26e5f8f5a 100644
--- a/phpgwapi/inc/class.nextmatchs.inc.php
+++ b/phpgwapi/inc/class.nextmatchs.inc.php
@@ -177,7 +177,7 @@
 				'lang_all'      => lang('All'),
 				'lang_select'   => lang('Select'),
 				'cat_field'     => $cat_field,
-				'categories'    => $GLOBALS['egw']->categories->formated_list('select','all',$cat_id,'True'),
+				'categories'    => $GLOBALS['egw']->categories->formatted_list('select','all',$cat_id,'True'),
 				'hidden'       => $GLOBALS['egw']->html->input_hidden(array(
 					'filter' => $this->_filter,
 					'qfield' => $this->_qfield,
@@ -363,7 +363,7 @@
 				'lang_all'      => lang('All'),
 				'lang_select'   => lang('Select'),
 				'cat_field'     => $cat_field,
-				'categories'    => $GLOBALS['egw']->categories->formated_list('select','all',(int)$cat_id,'True'),
+				'categories'    => $GLOBALS['egw']->categories->formatted_list('select','all',(int)$cat_id,'True'),
 				'hidden'       => $GLOBALS['egw']->html->input_hidden(array(
 					'filter' => $this->_filter,
 					'qfield' => $this->_qfield,
diff --git a/preferences/inc/class.bocategories.inc.php b/preferences/inc/class.bocategories.inc.php
index d90e983873..7b3ee30344 100644
--- a/preferences/inc/class.bocategories.inc.php
+++ b/preferences/inc/class.bocategories.inc.php
@@ -101,7 +101,7 @@
 
 		function formatted_list($format,$type,$cat_parent,$global_cats)
 		{
-			return $this->cats->formated_list($format,$type,$cat_parent,$global_cats);
+			return $this->cats->formatted_list($format,$type,$cat_parent,$global_cats);
 		}
 
 		function delete($cat_id,$subs)
diff --git a/preferences/inc/class.uicategories.inc.php b/preferences/inc/class.uicategories.inc.php
index 7643e54696..2334cb6271 100644
--- a/preferences/inc/class.uicategories.inc.php
+++ b/preferences/inc/class.uicategories.inc.php
@@ -423,7 +423,7 @@
 				$type = 'mains';
 			}
 
-			$GLOBALS['egw']->template->set_var('category_list',$this->bo->cats->formated_list(array(
+			$GLOBALS['egw']->template->set_var('category_list',$this->bo->cats->formatted_list(array(
 				'type' => $type,'selected' => $cat['parent'],
 				'globals' => $global_cats, 'self' => $cat_id
 			)));