firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

버전 5.4.5 수정

Browse Source
This commit is contained in:
thisgun
2021-02-05 14:05:22 +09:00
parent 64b1fc4d8f 5ff8d4ce71
commit b4190ec8a0
5 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Hook/hook.extends.class.php
View File

@ -130,10 +130,11 @@ Class GML_Hook extends Hook {
if (isset($that->callback_filters[$tag]) && isset($that->callback_filters[$tag][$priority]) ) {
$found_key = array_search($func, array_column($that->callback_filters[$tag][$priority], 'function'));
if( $found_key !== false ){
unset($that->callback_filters[$tag][$priority][$found_key]);
foreach((array) $that->callback_filters[$tag][$priority] as $key=>$value){
if(isset($value['function']) && $value['function'] === $func) {
unset($that->callback_filters[$tag][$priority][$key]);
$is_remove = true;
}
}
}
@ -148,10 +149,11 @@ Class GML_Hook extends Hook {
if (isset($that->callbacks[$tag]) && isset($that->callbacks[$tag][$priority]) ) {
$found_key = array_search($func, array_column($that->callbacks[$tag][$priority], 'function'));
if( $found_key !== false ){
unset($that->callbacks[$tag][$priority][$found_key]);
foreach((array) $that->callbacks[$tag][$priority] as $key=>$value){
if(isset($value['function']) && $value['function'] === $func) {
unset($that->callbacks[$tag][$priority][$key]);
$is_remove = true;
}
}
}

30
lib/cache.lib.php
View File

@ -8,6 +8,8 @@ function get_cachemanage_instance(){
static $instance = null;
if( ! (defined('G5_USE_CACHE') && G5_USE_CACHE) ) return $instance;
$instance = run_replace('get_cachemanage_instance', $instance);
if( $instance === null ){
$options = array(
@ -48,14 +50,22 @@ function g5_latest_cache_data($bo_table, $cache_list=array(), $find_wr_id=0){
function g5_set_cache($key, $save_data, $ttl = null){
if( $cache = get_cachemanage_instance() ){
$cache->save($key, $save_data, $ttl);
run_event('g5_set_cache_event', $cache, $key, $save_data, $ttl);
if( (is_object($cache) && get_class($cache) === 'FileCache') ){
$cache->save($key, $save_data, $ttl);
}
}
}
function g5_get_cache($key, $expired_time=0){
if( $cache = get_cachemanage_instance() ){
return $cache->get($key, $expired_time);
if( (is_object($cache) && get_class($cache) === 'FileCache') ){
return $cache->get($key, $expired_time);
}
return run_replace('g5_get_cache_replace', false, $cache, $key, $expired_time);
}
return false;
@ -82,13 +92,21 @@ function g5_delete_all_cache(){
}
function g5_delete_cache_by_prefix($key){
$files = glob(G5_DATA_PATH.'/cache/'.$key.'*');
foreach( (array) $files as $filename){
if(empty($filename)) continue;
$cache = get_cachemanage_instance();
$files = null;
unlink($filename);
if( (is_object($instance) && get_class($instance) === 'FileCache') ) {
$files = glob(G5_DATA_PATH.'/cache/'.$key.'*');
foreach( (array) $files as $filename){
if(empty($filename)) continue;
unlink($filename);
}
}
$files = run_replace('g5_delete_cache_by_prefix', $files, $key);
return ($files) ? true : false;
}