step three of contenttype name plural - replace all instances where name is accessed though type hash with get name method call, still no schema change requiredpre_ctype_desc_name_schmeachange

4 files changed, 10 insertions, 10 deletions

diff --git a/admin/admin_search_inc.php b/admin/admin_search_inc.php
index 95d860f..ff7d198 100644
--- a/admin/admin_search_inc.php
+++ b/admin/admin_search_inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_search/admin/admin_search_inc.php,v 1.17 2009/10/01 14:17:04 wjames5 Exp $
+// $Header: /cvsroot/bitweaver/_bit_search/admin/admin_search_inc.php,v 1.18 2010/04/17 15:36:08 wjames5 Exp $
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See below for details and a complete list of authors.
@@ -118,7 +118,7 @@ if( empty( $contentTypes ) ) {
 	$contentTypes = array( '' => tra( 'All Content' ) );
 	foreach( $gLibertySystem->mContentTypes as $cType ) {
 		if( $gBitSystem->getConfig( 'search_pkg_'.$cType['content_type_guid']) ) {
-			$contentTypes[$cType['content_type_guid']] = $cType['content_description'];
+			$contentTypes[$cType['content_type_guid']] = $gLibertySystem->getContentTypeName( $cType['content_type_guid'] );
 		}
 	}
 	$gBitSmarty->assign( 'contentTypes', $contentTypes );
diff --git a/index.php b/index.php
index b03819b..622ce24 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_search/index.php,v 1.28 2010/02/08 21:27:25 wjames5 Exp $
+// $Header: /cvsroot/bitweaver/_bit_search/index.php,v 1.29 2010/04/17 15:36:08 wjames5 Exp $
 
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See below for details and a complete list of authors.
@@ -20,7 +20,7 @@ $gBitSystem->verifyPackage( 'search' );
 if( empty( $contentTypes ) ) {
 	$contentTypes = array( '' => tra( 'All Content' ) );
 	foreach( $gLibertySystem->mContentTypes as $cType ) {
-		$contentTypes[$cType['content_type_guid']] = $cType['content_description'];
+		$contentTypes[$cType['content_type_guid']] = $gLibertySystem->getContentTypeName( $cType['content_type_guid'] );
 	}
 }
 asort($contentTypes);
diff --git a/modules/mod_global_search.php b/modules/mod_global_search.php
index 4fe9d72..0103a8a 100644
--- a/modules/mod_global_search.php
+++ b/modules/mod_global_search.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_search/modules/mod_global_search.php,v 1.11 2009/10/01 14:17:04 wjames5 Exp $
+ * $Header: /cvsroot/bitweaver/_bit_search/modules/mod_global_search.php,v 1.12 2010/04/17 15:36:08 wjames5 Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
  * All Rights Reserved. See below for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details
  *
- * $Id: mod_global_search.php,v 1.11 2009/10/01 14:17:04 wjames5 Exp $
+ * $Id: mod_global_search.php,v 1.12 2010/04/17 15:36:08 wjames5 Exp $
  * @author  Luis Argerich (lrargerich@yahoo.com)
  * @package search
  * @subpackage modules
@@ -26,7 +26,7 @@ if( empty( $contentTypes ) ) {
 		if (SearchLib::has_permission($cType["content_type_guid"])
 			and ( ! $gBitSystem->getConfig('search_restrict_types') ||
 				  $gBitSystem->getConfig('search_pkg_'.$cType["content_type_guid"]) ) ) {
-			$contentTypes[$cType['content_type_guid']] = $cType['content_description'];
+			$contentTypes[$cType['content_type_guid']] = $gLibertySystem->getContentTypeName( $cType['content_type_guid'] );
 		}
 	}
 }
diff --git a/modules/mod_package_search.php b/modules/mod_package_search.php
index a22b69f..bab98c8 100644
--- a/modules/mod_package_search.php
+++ b/modules/mod_package_search.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_search/modules/mod_package_search.php,v 1.15 2009/10/01 14:17:04 wjames5 Exp $
+ * $Header: /cvsroot/bitweaver/_bit_search/modules/mod_package_search.php,v 1.16 2010/04/17 15:36:08 wjames5 Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
  * All Rights Reserved. See below for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details
  *
- * $Id: mod_package_search.php,v 1.15 2009/10/01 14:17:04 wjames5 Exp $
+ * $Id: mod_package_search.php,v 1.16 2010/04/17 15:36:08 wjames5 Exp $
  * @author  Luis Argerich (lrargerich@yahoo.com)
  * @package search
  * @subpackage modules
@@ -38,7 +38,7 @@ require_once(SEARCH_PKG_PATH."search_lib.php");
 			if (SearchLib::has_permission($cType["content_type_guid"])
 				and ( ! $gBitSystem->getConfig('search_restrict_types') ||
 					  $gBitSystem->getConfig('search_pkg_'.$cType["content_type_guid"]) ) ) {
-				$contentTypes[$cType['content_type_guid']] = $cType['content_description'];
+				$contentTypes[$cType['content_type_guid']] = $gLibertySystem->getContentTypeName( $cType['content_type_guid'] );
 			}
 		}
 	}