Version 5.0.0 beta 5
This commit is contained in:
1 parent
2f24f9de48
commit
57d9db6ce2
218 files changed
+5331
-7416
No files matched your search
+10
-4
@@ -2833,12 +2833,15 @@ abstract class Item extends Content
|
||||
/* Work out the order */
|
||||
if ( $order === NULL )
|
||||
{
|
||||
$dateColumn = static::$databaseColumnMap['date'];
|
||||
if ( is_array( $dateColumn ) )
|
||||
if( isset( static::$databaseColumnMap[ 'date' ] ) )
|
||||
{
|
||||
$dateColumn = array_pop( $dateColumn );
|
||||
$dateColumn = static::$databaseColumnMap['date'];
|
||||
if ( is_array( $dateColumn ) )
|
||||
{
|
||||
$dateColumn = array_pop( $dateColumn );
|
||||
}
|
||||
$order = static::$databaseTable . '.' . static::$databasePrefix . $dateColumn . ' DESC';
|
||||
}
|
||||
$order = static::$databaseTable . '.' . static::$databasePrefix . $dateColumn . ' DESC';
|
||||
}
|
||||
|
||||
$containerWhere = array();
|
||||
@@ -6340,6 +6343,9 @@ abstract class Item extends Content
|
||||
{
|
||||
$blurb = NULL;
|
||||
|
||||
/* Preload some language strings */
|
||||
Member::loggedIn()->language()->get( ['comment_meta_date_weeks_later', 'comment_meta_date_months_later', 'comment_meta_date_years_later'] );
|
||||
|
||||
/* Years? */
|
||||
if ( $nextDate->diff( $date )->y > 0 )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user