fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Fix #881 disable display.before triggers if site is locked and visitor is not admin"

Browse source 
This reverts commit 44be0468ab.
This commit is contained in:
Kijin Sung 2017-07-31 15:57:53 +09:00
parent 44be0468ab
commit a3b557dcbc
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
classes/display/DisplayHandler.class.php
View file

@ -15,6 +15,7 @@ class DisplayHandler extends Handler
public static $debug_printed = 0;
var $content_size = 0; // /< The size of displaying contents
var $gz_enabled = FALSE; // / <a flog variable whether to call contents after compressing by gzip
var $handler = NULL;
/**
* print either html or xml content given oModule object
@ -58,22 +59,18 @@ class DisplayHandler extends Handler
$output = $handler->toDoc($oModule);
// Skip the following if site lock is effective
if(!config('lock.locked') || Context::get('logged_info')->is_admin === 'Y')
{
// call a trigger before display
ModuleHandler::triggerCall('display', 'before', $output);
$original_output = $output;
// call a trigger before display
ModuleHandler::triggerCall('display', 'before', $output);
$original_output = $output;
// execute add-on
$called_position = 'before_display_content';
$oAddonController = getController('addon');
$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
if(file_exists($addon_file)) include($addon_file);
if($output === false || $output === null || $output instanceof Object)
{
$output = $original_output;
}
// execute add-on
$called_position = 'before_display_content';
$oAddonController = getController('addon');
$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone() ? "mobile" : "pc");
if(file_exists($addon_file)) include($addon_file);
if($output === false || $output === null || $output instanceof Object)
{
$output = $original_output;
}
if(method_exists($handler, "prepareToPrint"))
@ -143,6 +140,7 @@ class DisplayHandler extends Handler
public function getDebugInfo(&$output = null)
{
// Check if debugging information has already been printed.
if (self::$debug_printed)
{
return;