summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Pigeonholes.php8
-rw-r--r--admin/schema_inc.php6
-rw-r--r--templates/view_table_inc.tpl2
3 files changed, 10 insertions, 6 deletions
diff --git a/Pigeonholes.php b/Pigeonholes.php
index 312dc76..7ed0106 100644
--- a/Pigeonholes.php
+++ b/Pigeonholes.php
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Header: /cvsroot/bitweaver/_bit_pigeonholes/Pigeonholes.php,v 1.131 2009/10/01 14:17:03 wjames5 Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_pigeonholes/Pigeonholes.php,v 1.132 2010/04/17 22:46:09 wjames5 Exp $
*
* +----------------------------------------------------------------------+
* | Copyright ( c ) 2004, bitweaver.org
@@ -17,7 +17,7 @@
* Pigeonholes class
*
* @author xing <xing@synapse.plus.com>
- * @version $Revision: 1.131 $
+ * @version $Revision: 1.132 $
* @package pigeonholes
*/
@@ -45,7 +45,7 @@ class Pigeonholes extends LibertyMime {
LibertyMime::LibertyMime();
$this->registerContentType( PIGEONHOLES_CONTENT_TYPE_GUID, array(
'content_type_guid' => PIGEONHOLES_CONTENT_TYPE_GUID,
- 'content_description' => 'Pigeonhole',
+ 'content_name' => 'Pigeonhole',
'handler_class' => 'Pigeonholes',
'handler_package' => 'pigeonholes',
'handler_file' => 'Pigeonholes.php',
@@ -175,7 +175,7 @@ class Pigeonholes extends LibertyMime {
$query = "
SELECT pigm.*,
lc.`content_id`, lc.`last_modified`, lc.`user_id`, lc.`title`, lc.`content_type_guid`, lc.`created`,
- lct.`content_description`, lcds.`data` AS `summary`,
+ lct.`content_name`, lcds.`data` AS `summary`,
uu.`login`, uu.`real_name`, lf.`storage_path` $select
FROM `".BIT_DB_PREFIX."pigeonhole_members` pigm
INNER JOIN `".BIT_DB_PREFIX."pigeonholes` pig ON ( pig.`content_id` = pigm.`parent_id` )
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 5ac9e7e..df9b8db 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -50,4 +50,8 @@ $gBitInstaller->registerUserPermissions( PIGEONHOLES_PKG_NAME, array(
//array( 'p_pigeonholes_admin', 'Can administer all aspects of pigeonholes', 'editors', PIGEONHOLES_PKG_NAME ),
) );
-?>
+// Requirements
+$gBitInstaller->registerRequirements( PIGEONHOLES_PKG_NAME, array(
+ 'liberty' => array( 'min' => '2.1.4' ),
+));
+
diff --git a/templates/view_table_inc.tpl b/templates/view_table_inc.tpl
index b7c1492..dfb2f2b 100644
--- a/templates/view_table_inc.tpl
+++ b/templates/view_table_inc.tpl
@@ -28,7 +28,7 @@
{if $gBitSystem->isFeatureActive( 'pigeonholes_member_thumb' ) && $member.thumbnail_url.$size}
<img src="{$member.thumbnail_url.$size}" alt="{$member.title|escape}" title="{$member.title|escape}" /><br />
{/if}
- {$member.title|escape}{if $gBitSystem->isFeatureActive( 'pigeonholes_display_content_type' )} &nbsp; <small>{tr}{$member.content_description}{/tr}</small>{/if}
+ {$member.title|escape}{if $gBitSystem->isFeatureActive( 'pigeonholes_display_content_type' )} &nbsp; <small>{tr}{$member.content_name}{/tr}</small>{/if}
</a>
</li>
{/foreach}