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

5 files changed, 10 insertions, 10 deletions

diff --git a/liberty_rss.php b/liberty_rss.php
index c1ab729..46ce15c 100644
--- a/liberty_rss.php
+++ b/liberty_rss.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_liberty/liberty_rss.php,v 1.12 2010/02/08 21:27:23 wjames5 Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_liberty/liberty_rss.php,v 1.13 2010/04/17 04:56:46 wjames5 Exp $
  * @package wiki
  * @subpackage functions
  */
@@ -42,7 +42,7 @@ foreach( $feeds as $feed ) {
 	// create a page header that we know what type of data we're looking at
 	$description =
 		tra( 'Package' ).     ': '.ucfirst( $gLibertySystem->mContentTypes[$feed['content_type_guid']]['handler_package'] ).'<br />'.
-		tra( 'Content Type' ).': '.$gLibertySystem->mContentTypes[$feed['content_type_guid']]['content_description'].'<br />';
+		tra( 'Content Type' ).': '.$gLibertySystem->getContentTypeName( $feed['content_type_guid'] ).'<br />';
 
 	// add the parsed data, if there is any
 	if( !empty( $feed['data'] ) ) {
diff --git a/modules/mod_last_changes.php b/modules/mod_last_changes.php
index 4219c13..e65d692 100644
--- a/modules/mod_last_changes.php
+++ b/modules/mod_last_changes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_liberty/modules/mod_last_changes.php,v 1.12 2008/07/29 18:04:23 lsces Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_liberty/modules/mod_last_changes.php,v 1.13 2010/04/17 04:56:46 wjames5 Exp $
  * @package liberty
  * @subpackage modules
  * Params:
@@ -21,7 +21,7 @@ if( !empty( $gQueryUser->mUserId ) ) {
 
 if( empty( $module_title ) ) {
 	if( !empty( $module_params['content_type_guid'] ) && !empty( $gLibertySystem->mContentTypes[$module_params['content_type_guid']] ) ) {
-		$title = tra( "Last Changes" ).': '.tra( $gLibertySystem->mContentTypes[$module_params['content_type_guid']]['content_description'] );
+		$title = tra( "Last Changes" ).': '.$gLibertySystem->getContentTypeName( $module_params['content_type_guid'] );
 	} else {
 		$title = tra( "Last Changes" );
 	}
diff --git a/modules/mod_last_comments.php b/modules/mod_last_comments.php
index 9b30efc..d084074 100644
--- a/modules/mod_last_comments.php
+++ b/modules/mod_last_comments.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_liberty/modules/mod_last_comments.php,v 1.6 2008/02/02 19:03:41 nickpalmer Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_liberty/modules/mod_last_comments.php,v 1.7 2010/04/17 04:56:46 wjames5 Exp $
  * @package liberty
  * @subpackage modules
  */
@@ -37,7 +37,7 @@ if (!empty($params['pigeonholes'])) {
 
 if( !empty( $params['root_content_type_guid'] ) ) {
 	if( empty($moduleTitle) && is_string( $params['root_content_type_guid'] ) ) {
-		$moduleTitle = $gLibertySystem->mContentTypes[$params['root_content_type_guid']]['content_description'].' '.tra( 'Comments' );
+		$moduleTitle = $gLibertySystem->getContentTypeName( $params['root_content_type_guid'] ).' '.tra( 'Comments' );
 	}
 	$listHash['root_content_type_guid'] = $params['root_content_type_guid'];
 }
diff --git a/modules/mod_top_authors.php b/modules/mod_top_authors.php
index 89292f1..77d399e 100644
--- a/modules/mod_top_authors.php
+++ b/modules/mod_top_authors.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/bitweaver/_bit_liberty/modules/mod_top_authors.php,v 1.7 2008/09/02 05:26:59 laetzer Exp $
+// $Header: /cvsroot/bitweaver/_bit_liberty/modules/mod_top_authors.php,v 1.8 2010/04/17 04:56:46 wjames5 Exp $
 /**
  * Params:
  * - content_type_guid : if set, show only those content_type_guid's
@@ -13,7 +13,7 @@ extract( $moduleParams );
 /* this doesn't work as expected. without it, the user can fill in the title himself
 if( empty( $module_title ) ) {
 	if( !empty( $module_params['content_type_guid'] ) && !empty( $gLibertySystem->mContentTypes[$module_params['content_type_guid']] ) ) {
-		$title = tra( "Top Authors" ).': '.tra( $gLibertySystem->mContentTypes[$module_params['content_type_guid']]['content_description'] );
+		$title = tra( "Top Authors" ).': '.$gLibertySystem->getContentTypeName( $module_params['content_type_guid'] );
 	} else {
 		$gBitSmarty->assign( 'showContentType', TRUE );
 		$title = tra( "Top Authors" );
diff --git a/templates/center_list_generic.php b/templates/center_list_generic.php
index a941548..c888090 100644
--- a/templates/center_list_generic.php
+++ b/templates/center_list_generic.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_liberty/templates/center_list_generic.php,v 1.1 2008/03/28 21:09:48 wjames5 Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_liberty/templates/center_list_generic.php,v 1.2 2010/04/17 04:56:46 wjames5 Exp $
  * @package bitweaver
  */
 global $gBitSmarty, $gBitSystem, $gQueryUserId, $moduleParams, $gBitUser, $gLibertySystem, $gContent;
@@ -14,7 +14,7 @@ $_REQUEST['output'] = "raw";
 include_once( LIBERTY_PKG_PATH.'list_content.php' );
 
 if ( isset($moduleParams['content_type_guid'] )){
-   	$contentType = $gLibertySystem->mContentTypes[ $moduleParams['content_type_guid'] ]['content_description'];
+	$contentType = $gLibertySystem->getContentTypeName( $moduleParams['content_type_guid'] );
 	$gBitSmarty->assign( "contentType", $contentType );
 }
 ?>