Version 4.2.0

system/Helpers/Table/Content.php

@@ -1,12 +1,11 @@
 <?php
 /**
  * @brief		Table Builder using an \IPS\Content\Item class datasource
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Community Suite
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @package		Invision Community
  * @since		16 Jul 2013
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\Helpers\Table;
@@ -56,7 +55,7 @@ class _Content extends Table
 	/**
 	 * @brief	Honor the pinned flag for sorting. Will be set to false in stream-like views
 	 */
-	protected $honorPinned	= TRUE;
+	public $honorPinned	= TRUE;
 	
 	/**
 	 * @brief	Show moved links in the result set. This is desirable in controller generated views but not streams or widgets, etc.
@@ -139,7 +138,7 @@ class _Content extends Table
 			$this->where[] = array( $class::$databaseTable . '.' . $class::$databasePrefix . $class::$databaseColumnMap['container'] . '=?', $container->_id );
 			$this->sortDirection = ( $this->sortDirection !== NULL ) ? $this->sortDirection : $container->_sortOrder;
 
-			if ( !$this->sortBy and $container->_sortBy !== NULL )
+			if ( !$this->sortBy and ! empty( $container->_sortBy ) )
 			{
 				$this->sortBy =  $class::$databaseTable . '.' . $class::$databasePrefix . $container->_sortBy;
 			}
@@ -154,9 +153,24 @@ class _Content extends Table
 			}
 			
 			/* Set breadcrumb */
-			foreach ( $container->parents() as $parent )
+			if ( \IPS\IPS::classUsesTrait( $container, 'IPS\Content\ClubContainer' ) and $club = $container->club() )
 			{
-				\IPS\Output::i()->breadcrumb[] = array( $parent->url(), $parent->_title );
+				\IPS\core\FrontNavigation::$clubTabActive = TRUE;
+				\IPS\Output::i()->breadcrumb = array();
+				\IPS\Output::i()->breadcrumb[] = array( \IPS\Http\Url::internal( 'app=core&module=clubs&controller=directory', 'front', 'clubs_list' ), \IPS\Member::loggedIn()->language()->addToStack('module__core_clubs') );
+				\IPS\Output::i()->breadcrumb[] = array( $club->url(), $club->name );
+				
+				if ( \IPS\Settings::i()->clubs_header == 'sidebar' )
+				{
+					\IPS\Output::i()->sidebar['contextual'] = \IPS\Theme::i()->getTemplate( 'clubs', 'core' )->header( $club, $container, 'sidebar' );
+				}
+			}
+			else
+			{
+				foreach ( $container->parents() as $parent )
+				{
+					\IPS\Output::i()->breadcrumb[] = array( $parent->url(), $parent->_title );
+				}
 			}
 			\IPS\Output::i()->breadcrumb[] = array( NULL, $container->_title );
 			
@@ -485,6 +499,11 @@ class _Content extends Table
 	 */
 	protected function multimod()
 	{
+		if ( $this->noModerate )
+		{
+			return;
+		}
+		
 		\IPS\Session::i()->csrfCheck();
 
 		/* Basic check that we selected something */
@@ -518,7 +537,8 @@ class _Content extends Table
 					catch( \OutOfBoundsException $e ) { }
 					
 					return false;
-				}
+				},
+				'clubs'		=> TRUE
 			) ) );
 			if ( isset( $class::$databaseColumnMap['moved_to'] ) )
 			{