Version 4.7.23
This commit is contained in:
1 parent
7124a02564
commit
25ddeb65d6
1791 files changed
+76990
-44452
No files matched your search
@@ -1150,7 +1150,7 @@ class _Blog extends Core
|
||||
{
|
||||
$map['id1_type'] = 'blog_entries';
|
||||
$map['id1_from_parent'] = FALSE;
|
||||
if ( !isset( $info['id2'] ) OR \is_null( $info['id2'] ) )
|
||||
if ( !isset( $map['id2'] ) OR \is_null( $map['id2'] ) )
|
||||
{
|
||||
$map['location_key'] = 'blog_Entries';
|
||||
}
|
||||
@@ -1161,6 +1161,11 @@ class _Blog extends Core
|
||||
$map['id2_from_parent'] = FALSE;
|
||||
}
|
||||
|
||||
if ( isset( $map['id3'] ) AND $map['id3'] == 'description' )
|
||||
{
|
||||
$map['id3_skip_link'] = true;
|
||||
}
|
||||
|
||||
return parent::convertAttachment( $info, $map, $filepath, $filedata, $thumbnailpath );
|
||||
}
|
||||
|
||||
|
||||
@@ -487,7 +487,7 @@ class _Calendar extends Core
|
||||
/* If we didn't, make sure it's valid */
|
||||
try
|
||||
{
|
||||
\IPS\calendar\Icalendar\ICSParser::parserRrule( $info['event_recurring'] );
|
||||
\IPS\calendar\Icalendar\ICSParser::parseRrule( $info['event_recurring'] );
|
||||
}
|
||||
catch( \Exception $e )
|
||||
{
|
||||
@@ -1378,6 +1378,10 @@ class _Calendar extends Core
|
||||
{
|
||||
$map['id3'] = NULL;
|
||||
}
|
||||
else if ( $map['id3'] == 'description' )
|
||||
{
|
||||
$map['id3_skip_link'] = TRUE;
|
||||
}
|
||||
|
||||
if ( \is_null( $map['id3'] ) OR $map['id3'] != 'review' )
|
||||
{
|
||||
@@ -1386,6 +1390,7 @@ class _Calendar extends Core
|
||||
else
|
||||
{
|
||||
$map['id2_type'] = 'calendar_event_reviews';
|
||||
$map['id3_skip_link'] = TRUE;
|
||||
}
|
||||
|
||||
return parent::convertAttachment( $info, $map, $filepath, $filedata, $thumbnailpath );
|
||||
|
||||
@@ -1406,7 +1406,7 @@ class _Core extends \IPS\convert\Library
|
||||
}
|
||||
catch( \OutOfRangeException $e )
|
||||
{
|
||||
\IPS\Db::i()->delete( 'core_attachments', array( "attach_id=?", $id ) );
|
||||
\IPS\Db::i()->delete( 'core_attachments', array( "attach_id=?", $inserted_id ) );
|
||||
$this->software->app->log( 'attachment_missing_parent', __METHOD__, \IPS\convert\App::LOG_WARNING, $id );
|
||||
return FALSE;
|
||||
}
|
||||
@@ -3245,7 +3245,7 @@ class _Core extends \IPS\convert\Library
|
||||
/* Some generic stuff for uniformity */
|
||||
$info['members_seo_name'] = \IPS\Http\Url::seoTitle( $info['name'] );
|
||||
$info['members_cache'] = NULL;
|
||||
$info['failed_logins'] = json_encode( array() );
|
||||
unset( $info['failed_logins'] ); // no longer used
|
||||
$info['failed_login_count'] = 0;
|
||||
|
||||
if ( !isset( $info['members_profile_views'] ) )
|
||||
|
||||
@@ -941,7 +941,7 @@ class _Downloads extends Core
|
||||
$info['file_ipaddress'] = '127.0.0.1';
|
||||
}
|
||||
|
||||
$info['file_name_furl'] = \IPS\Http\url::seoTitle( $info['file_name'] );
|
||||
$info['file_name_furl'] = \IPS\Http\Url::seoTitle( $info['file_name'] );
|
||||
|
||||
if ( \IPS\Application::appIsEnabled( 'nexus' ) )
|
||||
{
|
||||
|
||||
@@ -621,7 +621,7 @@ class _Forums extends Core
|
||||
}
|
||||
|
||||
/* Just reset this */
|
||||
$info['name_seo'] = \IPS\Http\url::seoTitle( $name );
|
||||
$info['name_seo'] = \IPS\Http\Url::seoTitle( $name );
|
||||
|
||||
if ( !isset( $info['seo_last_title'] ) )
|
||||
{
|
||||
@@ -1817,7 +1817,7 @@ class _Forums extends Core
|
||||
unset( $info['id'] );
|
||||
}
|
||||
|
||||
$inserted_id = \IPS\Db::i()->insert( 'forums_question_ratings', $info );
|
||||
$inserted_id = \IPS\Db::i()->insert( 'forums_question_ratings', $info, TRUE );
|
||||
|
||||
if ( $hasId )
|
||||
{
|
||||
@@ -1937,7 +1937,7 @@ class _Forums extends Core
|
||||
unset( $info['id'] );
|
||||
}
|
||||
|
||||
$inserted_id = \IPS\Db::i()->insert( 'forums_answer_ratings', $info );
|
||||
$inserted_id = \IPS\Db::i()->insert( 'forums_answer_ratings', $info, TRUE );
|
||||
|
||||
if ( $hasId )
|
||||
{
|
||||
|
||||
@@ -1092,7 +1092,7 @@ class _Nexus extends \IPS\convert\Library
|
||||
|
||||
$package = array(
|
||||
'p_name' => $name,
|
||||
'p_seo_name' => \IPS\Http\url::seoTitle( $name ),
|
||||
'p_seo_name' => \IPS\Http\Url::seoTitle( $name ),
|
||||
'p_group' => 0,
|
||||
'p_stock' => -1,
|
||||
'p_reg' => 0,
|
||||
|
||||
Reference in new issue
Block a user