mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-04 15:57:45 +02:00
Merge remote-tracking branch 'upstream/develop' into feature/dic
* upstream/develop: (259 commits) [prep-release-3.0.11] Bumping version number for 3.0.11 final. [feature/php-events] Fix doc of core.viewonline_overwrite_location [feature/php-events] Fix doc of core.user_set_default_group [feature/php-events] Fix doc of core.generate_smilies_after [feature/php-events] Fix doc of core.delete_user_after [feature/php-events] Fix doc of core.delete_user_before [feature/php-events] Fix doc of core.update_username [feature/php-events] Fix doc of core.memberlist_prepare_profile_data [feature/php-events] Fix doc and position of viewonline_overwrite_location [feature/php-events] Fix doc of core.viewtopic_get_post_data [feature/php-events] Fix doc of core.viewtopic_cache_guest_data [ticket/11061] Add the --dev flag to the composer instructions in README [ticket/11060] Make sure pyrus can install everything on travis [ticket/11059] Use https for the README logo [feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum [feature/php-events] Fix core.acp_manage_forums_update_data_after vars [ticket/11032] fix language of error displayed [ticket/11052] update search backend constructor everywhere [ticket/11052] pass parametes to search construct while posting [ticket/11054] Fixed $config var description ... Conflicts: phpBB/includes/cron/task/core/tidy_cache.php phpBB/includes/cron/task/core/tidy_search.php
This commit is contained in:
4
phpBB/includes/cache/driver/file.php
vendored
4
phpBB/includes/cache/driver/file.php
vendored
@@ -364,7 +364,7 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base
|
||||
/**
|
||||
* Save sql query
|
||||
*/
|
||||
function sql_save($query, &$query_result, $ttl)
|
||||
function sql_save($query, $query_result, $ttl)
|
||||
{
|
||||
global $db;
|
||||
|
||||
@@ -385,6 +385,8 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base
|
||||
{
|
||||
$query_result = $query_id;
|
||||
}
|
||||
|
||||
return $query_id;
|
||||
}
|
||||
|
||||
/**
|
||||
|
2
phpBB/includes/cache/driver/interface.php
vendored
2
phpBB/includes/cache/driver/interface.php
vendored
@@ -75,7 +75,7 @@ interface phpbb_cache_driver_interface
|
||||
/**
|
||||
* Save sql query
|
||||
*/
|
||||
public function sql_save($query, &$query_result, $ttl);
|
||||
public function sql_save($query, $query_result, $ttl);
|
||||
|
||||
/**
|
||||
* Ceck if a given sql query exist in cache
|
||||
|
4
phpBB/includes/cache/driver/memory.php
vendored
4
phpBB/includes/cache/driver/memory.php
vendored
@@ -280,7 +280,7 @@ class phpbb_cache_driver_memory extends phpbb_cache_driver_base
|
||||
/**
|
||||
* Save sql query
|
||||
*/
|
||||
function sql_save($query, &$query_result, $ttl)
|
||||
function sql_save($query, $query_result, $ttl)
|
||||
{
|
||||
global $db;
|
||||
|
||||
@@ -335,6 +335,8 @@ class phpbb_cache_driver_memory extends phpbb_cache_driver_base
|
||||
$this->_write('sql_' . $hash, $this->sql_rowset[$query_id], $ttl);
|
||||
|
||||
$query_result = $query_id;
|
||||
|
||||
return $query_id;
|
||||
}
|
||||
|
||||
/**
|
||||
|
2
phpBB/includes/cache/driver/null.php
vendored
2
phpBB/includes/cache/driver/null.php
vendored
@@ -107,7 +107,7 @@ class phpbb_cache_driver_null extends phpbb_cache_driver_base
|
||||
/**
|
||||
* Save sql query
|
||||
*/
|
||||
function sql_save($query, &$query_result, $ttl)
|
||||
function sql_save($query, $query_result, $ttl)
|
||||
{
|
||||
}
|
||||
|
||||
|
11
phpBB/includes/cache/service.php
vendored
11
phpBB/includes/cache/service.php
vendored
@@ -332,27 +332,22 @@ class phpbb_cache_service
|
||||
$parsed_array = array();
|
||||
}
|
||||
|
||||
$reparse = false;
|
||||
$filename = $phpbb_root_path . 'styles/' . $style['style_path'] . '/style.cfg';
|
||||
|
||||
if (!file_exists($filename))
|
||||
{
|
||||
continue;
|
||||
return $parsed_array;
|
||||
}
|
||||
|
||||
if (!isset($parsed_array['filetime']) || (($config['load_tplcompile'] && @filemtime($filename) > $parsed_array['filetime'])))
|
||||
{
|
||||
$reparse = true;
|
||||
}
|
||||
|
||||
// Re-parse cfg file
|
||||
if ($reparse)
|
||||
{
|
||||
// Re-parse cfg file
|
||||
$parsed_array = parse_cfg_file($filename);
|
||||
$parsed_array['filetime'] = @filemtime($filename);
|
||||
|
||||
$this->driver->put('_cfg_' . $style['style_path'], $parsed_array);
|
||||
}
|
||||
|
||||
return $parsed_array;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user