Version 5.0.13

This commit is contained in:
Neo committed 2025-12-19 19:04:57 -08:00
1 parent b89858b2ff
commit 5efe744c5f
1407 files changed
+69690 -30177

No files matched your search

+34 -27
View File
@@ -208,7 +208,7 @@ class Db extends Table
{
unset( $advancedSearchValues[ $k ] );
}
break;
break;
case SEARCH_DATE_RANGE:
$timezone = ( Member::loggedIn()->timezone ? new DateTimeZone( Member::loggedIn()->timezone ) : NULL );
@@ -261,37 +261,44 @@ class Db extends Table
break;
case SEARCH_NODE:
$nodeClass = $options['class'];
$prop = $options['searchProp'] ?? '_id';
if ( !is_array( $v ) )
if( $v )
{
$v = array( $v );
}
$values = array();
foreach ( $v as $_v )
{
if ( !is_object( $_v ) )
$nodeClass = $options[ 'class' ];
$prop = $options[ 'searchProp' ]??'_id';
if( !is_array( $v ) )
{
if ( mb_substr( $_v, 0, 2 ) === 's.' )
{
$nodeClass = $nodeClass::$subnodeClass;
$_v = mb_substr( $_v, 2 );
}
try
{
$_v = $nodeClass::load( $_v );
}
catch ( OutOfRangeException $e )
{
continue;
}
$v = [$v];
}
$values[] = $_v->$prop;
$values = [];
foreach( $v as $_v )
{
if( !is_object( $_v ) )
{
if( mb_substr( $_v, 0, 2 ) === 's.' )
{
$nodeClass = $nodeClass::$subnodeClass;
$_v = mb_substr( $_v, 2 );
}
try
{
$_v = $nodeClass::load( $_v );
}
catch( OutOfRangeException $e )
{
continue;
}
}
$values[] = $_v->$prop;
}
$where[] = [$this->db->in( $k, $values )];
}
$where[] = array( $this->db->in( $k, $values ) );
else
{
unset( $advancedSearchValues[ $k ] );
}
break;
case SEARCH_NUMERIC:
case SEARCH_NUMERIC_TEXT:
switch ( $v[0] )