You missed a few spots which also need the $url_forum variable.
Using the first patch only, e.g. queued PM notificationss are never
delivered.
JM
--- includes/functions.php.orig 2010-02-16 21:50:35.000000000 +0100
+++ includes/functions.php 2010-02-16 21:51:09.000000000 +0100
@@ -3556,7 +3556,7 @@
*/
function page_footer($run_cron = true)
{
- global $db, $config, $template, $user, $auth, $cache, $starttime,
$phpbb_root_path, $phpEx;
+ global $db, $config, $template, $user, $auth, $cache, $starttime,
$phpbb_root_path, $phpEx, $url_forum;
// Output page creation time
if (defined('DEBUG'))
@@ -3601,7 +3601,7 @@
{
$cron_type = '';
- if (time() - $config['queue_interval'] >
$config['last_queue_run'] && !defined('IN_ADMIN') &&
file_exists($phpbb_root_path . 'cache/queue.' . $phpEx))
+ if (time() - $config['queue_interval'] >
$config['last_queue_run'] && !defined('IN_ADMIN') &&
file_exists($phpbb_root_path . 'cache/' . $url_forum . '/queue.' . $phpEx))
{
// Process email queue
$cron_type = 'queue';
--- ./includes/acp/acp_language.php.orig 2010-02-16 21:59:34.000000000
+0100
+++ ./includes/acp/acp_language.php 2010-02-16 22:03:22.000000000 +0100
@@ -34,6 +34,7 @@
global $config, $db, $user, $auth, $template, $cache;
global $phpbb_root_path, $phpbb_admin_path, $phpEx,
$table_prefix;
global $safe_mode, $file_uploads;
+ global $url_forum;
include_once($phpbb_root_path . 'includes/functions_user.' .
$phpEx);
@@ -269,7 +270,7 @@
foreach ($mkdir_ary as $dir)
{
- $dir = $phpbb_root_path .
'store/' . $dir;
+ $dir = $phpbb_root_path .
'store/' . $url_forum . '/' . $dir;
if (!is_dir($dir))
{
@@ -398,7 +399,7 @@
}
$transfer->rename($lang_path . $file,
$lang_path . $file . '.bak');
- $result = $transfer->copy_file('store/'
. $lang_path . $file, $lang_path . $file);
+ $result = $transfer->copy_file('store/'
. $url_forum . '/' . $lang_path . $file, $lang_path . $file);
if ($result === false)
{
@@ -412,9 +413,9 @@
$transfer->close_session();
// Remove from storage folder
- if (file_exists($phpbb_root_path .
'store/' . $lang_path . $file))
+ if (file_exists($phpbb_root_path .
'store/' . $url_forum . '/' . $lang_path . $file))
{
- @unlink($phpbb_root_path .
'store/' . $lang_path . $file);
+ @unlink($phpbb_root_path .
'store/' . $url_forum . '/' . $lang_path . $file);
}
add_log('admin',
'LOG_LANGUAGE_FILE_REPLACED', $file);
@@ -998,11 +999,11 @@
if ($use_method == '.zip')
{
- $compress = new compress_zip('w',
$phpbb_root_path . 'store/lang_' . $row['lang_iso'] . $use_method);
+ $compress = new compress_zip('w',
$phpbb_root_path . 'store/' . $url_forum . '/' . 'lang_' . $row['lang_iso'] .
$use_method);
}
else
{
- $compress = new compress_tar('w',
$phpbb_root_path . 'store/lang_' . $row['lang_iso'] . $use_method, $use_method);
+ $compress = new compress_tar('w',
$phpbb_root_path . 'store/' . $url_forum . '/' . 'lang_' . $row['lang_iso'] .
$use_method, $use_method);
}
// Get email templates
@@ -1055,7 +1056,7 @@
$compress->close();
$compress->download('lang_' . $row['lang_iso']);
- @unlink($phpbb_root_path . 'store/lang_' .
$row['lang_iso'] . $use_method);
+ @unlink($phpbb_root_path . 'store/' .
$url_forum . '/' . 'lang_' . $row['lang_iso'] . $use_method);
exit;
@@ -1208,12 +1209,13 @@
function get_filename($lang_iso, $directory, $filename, $check_store =
false, $only_return_filename = false)
{
global $phpbb_root_path, $safe_mode;
-
+ global $url_forum;
+
$check_filename = "language/$lang_iso/" . (($directory) ?
$directory . '/' : '') . $filename;
if ($check_store)
{
- $check_store_filename = ($safe_mode) ?
"store/langfile_{$lang_iso}" . (($directory) ? '_' . $directory : '') .
"_{$filename}" : "store/language/$lang_iso/" . (($directory) ? $directory . '/'
: '') . $filename;
+ $check_store_filename = ($safe_mode) ?
"store/$url_forum/langfile_{$lang_iso}" . (($directory) ? '_' . $directory :
'') . "_{$filename}" : "store/$url_forum/language/$lang_iso/" . (($directory) ?
$directory . '/' : '') . $filename;
if (!$only_return_filename &&
file_exists($phpbb_root_path . $check_store_filename))
{
--- ./includes/acp/acp_styles.php.orig 2010-02-16 21:59:40.000000000 +0100
+++ ./includes/acp/acp_styles.php 2010-02-16 22:04:19.000000000 +0100
@@ -1990,11 +1990,11 @@
if (!$store)
{
$compress->download($path);
-
@unlink("{$phpbb_root_path}store/$path$ext");
+
@unlink("{$phpbb_root_path}store/$url_forum/$path$ext");
exit;
}
- trigger_error(sprintf($user->lang[$l_prefix .
'_EXPORTED'], "store/$path$ext") . adm_back_link($this->u_action));
+ trigger_error(sprintf($user->lang[$l_prefix .
'_EXPORTED'], "store/$url_forum/$path$ext") . adm_back_link($this->u_action));
}
}
