Version 5.0.0 beta 4
This commit is contained in:
1 parent
e86153356a
commit
2f24f9de48
276 files changed
+8614
-6044
No files matched your search
@@ -221,7 +221,7 @@ class tag extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
return Theme::i()->getTemplate( 'tags', 'core', 'front' )->overview( $items );
|
||||
return Theme::i()->getTemplate( 'tags', 'core', 'front' )->overview( $items, $this->tag );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -372,9 +372,7 @@ class profile extends Controller
|
||||
$visitors = $this->member->profileVisitors;
|
||||
|
||||
/* Get followers */
|
||||
$followers = iterator_to_array(
|
||||
$this->member->followers( ( Member::loggedIn()->isAdmin() OR Member::loggedIn()->member_id === $this->member->member_id ) ? \IPS\Content::FOLLOW_PUBLIC + \IPS\Content::FOLLOW_ANONYMOUS : \IPS\Content::FOLLOW_PUBLIC, array( 'immediate', 'daily', 'weekly', 'none' ), NULL, array( 0, 12 ) )
|
||||
);
|
||||
$followers = $this->member->followers( ( Member::loggedIn()->isAdmin() OR Member::loggedIn()->member_id === $this->member->member_id ) ? \IPS\Content::FOLLOW_PUBLIC + \IPS\Content::FOLLOW_ANONYMOUS : \IPS\Content::FOLLOW_PUBLIC, array( 'immediate', 'daily', 'weekly', 'none' ), NULL, array( 0, 12 ) );
|
||||
|
||||
/* Get solutions */
|
||||
$solutions = Db::i()->select( 'COUNT(*)', 'core_solved_index', array( 'member_id=? AND type=? AND hidden=0', $this->member->member_id, 'solved' ) )->first();
|
||||
@@ -430,7 +428,7 @@ class profile extends Controller
|
||||
|
||||
/* Output */
|
||||
Output::i()->jsFiles = array_merge( Output::i()->jsFiles, Output::i()->js( 'front_profile.js', 'core' ) );
|
||||
Output::i()->output = Theme::i()->getTemplate( 'profile' )->profile( $this->member, $mainContent, $visitors, $sidebarFields, $followers, $addWarningUrl, $solutions );
|
||||
Output::i()->output = Theme::i()->getTemplate( 'profile' )->profile( $this->member, $mainContent, $visitors, $sidebarFields, ( is_numeric( $followers ) ? $followers : iterator_to_array( $followers ) ), $addWarningUrl, $solutions );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -70,9 +70,9 @@ class modcp extends Controller
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Still here? */
|
||||
Output::i()->error( 'page_not_found', '2C139/5', 404, '' );
|
||||
Output::i()->error( 'page_not_found', '2C139/6', 404, '' );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -752,7 +752,7 @@ class ajax extends Controller
|
||||
public function getCsrfKey() : void
|
||||
{
|
||||
/* Don't cache the CSRF key */
|
||||
Output::i()->pageCaching = FALSE;
|
||||
Output::setCacheTime( false );
|
||||
|
||||
if ( isset( Request::i()->path ) )
|
||||
{
|
||||
|
||||
@@ -37,7 +37,7 @@ class cookies extends Controller
|
||||
{
|
||||
parent::execute();
|
||||
|
||||
Output::i()->pageCaching = FALSE;
|
||||
Output::setCacheTime( false );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -59,7 +59,7 @@ class login extends Controller
|
||||
*/
|
||||
protected function manage() : void
|
||||
{
|
||||
Output::i()->pageCaching = FALSE;
|
||||
Output::setCacheTime( false );
|
||||
|
||||
foreach( Application::allExtensions( 'core', 'SSO', FALSE ) as $ext )
|
||||
{
|
||||
@@ -282,7 +282,7 @@ class login extends Controller
|
||||
/* Otherwise show the reauthenticate form */
|
||||
Output::i()->bodyClasses[] = 'ipsLayout_minimal';
|
||||
Output::i()->sidebar['enabled'] = FALSE;
|
||||
Output::i()->pageCaching = FALSE;
|
||||
Output::setCacheTime( false );
|
||||
Output::i()->title = Member::loggedIn()->language()->addToStack('login');
|
||||
Output::i()->output = Theme::i()->getTemplate( 'system' )->mergeSocialAccount( $handler, $member, $login, $error );
|
||||
}
|
||||
|
||||
@@ -113,7 +113,7 @@ class register extends Controller
|
||||
Output::i()->bodyClasses[] = 'ipsLayout_minimalNoHome';
|
||||
}
|
||||
Output::i()->sidebar['enabled'] = FALSE;
|
||||
Output::i()->pageCaching = FALSE;
|
||||
Output::setCacheTime( false );
|
||||
Output::i()->linkTags['canonical'] = (string) Url::internal( 'app=core&module=system&controller=register', 'front', 'register' );
|
||||
}
|
||||
|
||||
|
||||
@@ -35,6 +35,7 @@ use const IMAGETYPE_GIF;
|
||||
use const IMAGETYPE_JPEG;
|
||||
use const IMAGETYPE_PNG;
|
||||
use const IMAGETYPE_WEBP;
|
||||
use const IMAGETYPE_AVIF;
|
||||
|
||||
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
{
|
||||
@@ -180,7 +181,7 @@ class themeeditor extends Controller
|
||||
$fileExt = strtolower( pathinfo( $file['name'], PATHINFO_EXTENSION ) );
|
||||
$imageAttributes = getimagesize( $file['tmp_name'] );
|
||||
$logoHeightSetting = 'set__i-logo--he';
|
||||
if ( $fileExt === 'svg' or in_array( $imageAttributes[2], [IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_WEBP] ) )
|
||||
if ( $fileExt === 'svg' or in_array( $imageAttributes[2], [IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_WEBP, IMAGETYPE_AVIF] ) )
|
||||
{
|
||||
/* So we can use the File::create() obfuscation, but it will not re-add the file extension back on for SVG, so... */
|
||||
$baseName = pathinfo( $file['name'], PATHINFO_FILENAME );
|
||||
|
||||
Reference in new issue
Block a user