diff options
| -rw-r--r-- | admin/admin_pigeonholes_inc.php | 4 | ||||
| -rw-r--r-- | assign_content.php | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/admin/admin_pigeonholes_inc.php b/admin/admin_pigeonholes_inc.php index ac0c9b5..80e8347 100644 --- a/admin/admin_pigeonholes_inc.php +++ b/admin/admin_pigeonholes_inc.php @@ -1,5 +1,5 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_pigeonholes/admin/admin_pigeonholes_inc.php,v 1.22 2008/10/18 23:11:07 nickpalmer Exp $ +// $Header: /cvsroot/bitweaver/_bit_pigeonholes/admin/admin_pigeonholes_inc.php,v 1.23 2010/04/17 15:36:07 wjames5 Exp $ $pigeonholeDisplaySettings = array( 'pigeonholes_display_path' => array( @@ -94,7 +94,7 @@ $gBitSmarty->assign( 'imageSizes', get_image_size_options() ); $exclude = array( 'tikisticky', 'pigeonholes' ); foreach( $gLibertySystem->mContentTypes as $cType ) { if( !in_array( $cType['content_type_guid'], $exclude ) ) { - $formPigeonholeable['guids']['pigeonhole_no_'.$cType['content_type_guid']] = $cType['content_description']; + $formPigeonholeable['guids']['pigeonhole_no_'.$cType['content_type_guid']] = $gLibertySystem->getContentTypeName( $cType['content_type_guid'] ); } } diff --git a/assign_content.php b/assign_content.php index 21330b7..44b8ee3 100644 --- a/assign_content.php +++ b/assign_content.php @@ -1,6 +1,6 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_pigeonholes/assign_content.php,v 1.18 2010/02/08 21:27:24 wjames5 Exp $ + * $Header: /cvsroot/bitweaver/_bit_pigeonholes/assign_content.php,v 1.19 2010/04/17 15:36:07 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: assign_content.php,v 1.18 2010/02/08 21:27:24 wjames5 Exp $ + * $Id: assign_content.php,v 1.19 2010/04/17 15:36:07 wjames5 Exp $ * @package pigeonholes * @subpackage functions */ @@ -29,7 +29,7 @@ $gBitSmarty->assign_by_ref( 'feedback', $feedback ); $contentTypes = array( '' => tra( 'All Content' ) ); foreach( $gLibertySystem->mContentTypes as $cType ) { if( $cType['content_type_guid'] != PIGEONHOLES_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 ); |