diff options
| -rw-r--r-- | Pigeonholes.php | 13 | ||||
| -rw-r--r-- | assign_content.php | 5 | ||||
| -rw-r--r-- | templates/assign_content.tpl | 2 |
3 files changed, 5 insertions, 15 deletions
diff --git a/Pigeonholes.php b/Pigeonholes.php index 7b3fc68..78275fe 100644 --- a/Pigeonholes.php +++ b/Pigeonholes.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_pigeonholes/Pigeonholes.php,v 1.64 2006/06/18 07:43:06 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_pigeonholes/Pigeonholes.php,v 1.65 2006/06/18 07:58:13 squareing Exp $ * * +----------------------------------------------------------------------+ * | Copyright ( c ) 2004, bitweaver.org @@ -17,7 +17,7 @@ * Pigeonholes class * * @author xing <xing@synapse.plus.com> - * @version $Revision: 1.64 $ + * @version $Revision: 1.65 $ * @package pigeonholes */ @@ -165,7 +165,6 @@ class Pigeonholes extends LibertyContent { **/ function getAssignableContent( &$pListHash ) { global $gBitUser, $gLibertySystem, $gBitSystem; - LibertyContent::prepGetList( $pListHash ); $where = ''; $bindVars = array(); @@ -227,14 +226,6 @@ class Pigeonholes extends LibertyContent { } } - $query = "SELECT COUNT( lc.`content_id` ) - FROM `".BIT_DB_PREFIX."liberty_content` lc - LEFT JOIN `".BIT_DB_PREFIX."pigeonhole_members` pigm ON ( pigm.`content_id` = lc.`content_id` ) - LEFT JOIN `".BIT_DB_PREFIX."users_users` uu ON ( uu.`user_id` = lc.`user_id` ) - $where"; - $pListHash['cant'] = $this->mDb->getOne( $query, $bindVars ); - - LibertyContent::postGetList( $pListHash ); return( !empty( $ret ) ? $ret : NULL ); } diff --git a/assign_content.php b/assign_content.php index b44e3df..bf948c5 100644 --- a/assign_content.php +++ b/assign_content.php @@ -1,6 +1,6 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_pigeonholes/assign_content.php,v 1.4 2006/06/18 07:43:06 squareing Exp $ + * $Header: /cvsroot/bitweaver/_bit_pigeonholes/assign_content.php,v 1.5 2006/06/18 07:58:13 squareing Exp $ * * Copyright ( c ) 2004 bitweaver.org * Copyright ( c ) 2003 tikwiki.org @@ -8,7 +8,7 @@ * All Rights Reserved. See copyright.txt for details and a complete list of authors. * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details * - * $Id: assign_content.php,v 1.4 2006/06/18 07:43:06 squareing Exp $ + * $Id: assign_content.php,v 1.5 2006/06/18 07:58:13 squareing Exp $ * @package pigeonholes * @subpackage functions */ @@ -41,7 +41,6 @@ $listHash = array( 'content_type' => $contentSelect, ); $assignableContent = $gContent->getAssignableContent( $listHash ); -$gBitSmarty->assign( 'listInfo', $listHash['listInfo'] ); if( !empty( $_REQUEST['insert_content'] ) && isset( $_REQUEST['pigeonhole'] ) ) { // here we need to limit all killing to the selected structure diff --git a/templates/assign_content.tpl b/templates/assign_content.tpl index f961b2d..318db11 100644 --- a/templates/assign_content.tpl +++ b/templates/assign_content.tpl @@ -69,7 +69,7 @@ {/if} <table class="data"> - <caption>{tr}Available Content{/tr} <span class="total">[ {$listInfo.total_records} ]</span></caption> + <caption>{tr}Available Content{/tr}</caption> <tr> <th>{smartlink ititle="Title" isort=title idefault=1 max_rows=$smarty.request.max_rows content_type=$contentSelect find_objects=$find_objects include=$smarty.request.include page=$page}</th> <th>{smartlink ititle="Content Type" isort=content_type_guid max_rows=$smarty.request.max_rows content_type=$contentSelect find_objects=$find_objects include=$smarty.request.include page=$page}</th> |