Version 4.7.23
This commit is contained in:
1 parent
7124a02564
commit
25ddeb65d6
1791 files changed
+76990
-44452
No files matched your search
@@ -45,12 +45,16 @@ class _search extends \IPS\Dispatcher\Controller
|
||||
*/
|
||||
protected function _checkCached()
|
||||
{
|
||||
/* Check whether a 304 Not modified response is appropriate */
|
||||
if( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) AND ( new \IPS\DateTime( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )->getTimestamp() > ( time() - $this->_cacheTimeout ) )
|
||||
try
|
||||
{
|
||||
header('HTTP/1.1 304 Not Modified' );
|
||||
exit;
|
||||
/* Check whether a 304 Not modified response is appropriate */
|
||||
if( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) AND ( new \IPS\DateTime( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )->getTimestamp() > ( time() - $this->_cacheTimeout ) )
|
||||
{
|
||||
header('HTTP/1.1 304 Not Modified' );
|
||||
exit;
|
||||
}
|
||||
}
|
||||
catch( \Exception $e ){}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1066,7 +1070,12 @@ class _search extends \IPS\Dispatcher\Controller
|
||||
/* Fields */
|
||||
foreach ( $fields as $id => $field )
|
||||
{
|
||||
|
||||
/* Only show to non-staff if available to view by all. */
|
||||
if ( \IPS\core\ProfileFields\Field::load( $id )->member_hide != 'all' AND ( !\IPS\Member::loggedIn()->isAdmin() OR !\IPS\Member::loggedIn()->modPermissions() ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
/* Alias the lang keys */
|
||||
$realLangKey = "core_pfield_{$id}";
|
||||
|
||||
|
||||
Reference in new issue
Block a user