mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

fix some general bugs and some convertor related

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@6872 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-01-10 16:47:16 +00:00
parent 31ee257ab8
commit b621bb66c5
13 changed files with 170 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/includes/acp/acp_language.php
View File

@@ -241,6 +241,9 @@ class acp_language
$entry .= "\t),\n";
fwrite($fp, $entry);
}
$footer = ");\n\n?>";
fwrite($fp, $footer);
}
else
{
@@ -253,10 +256,10 @@ class acp_language
$entry = $this->format_lang_array($key, $value);
fwrite($fp, $entry);
}
}
$footer = "));\n\n?>";
fwrite($fp, $footer);
$footer = "));\n\n?>";
fwrite($fp, $footer);
}
}
fclose($fp);

4
phpBB/includes/acp/acp_search.php
View File

@@ -338,7 +338,9 @@ class acp_search
while ($row = $db->sql_fetchrow($result))
{
if ($forums[$row['forum_id']])
// Indexing enabled for this forum or global announcement?
// Global announcements get indexed by default.
if (!$row['forum_id'] || (isset($forums[$row['forum_id']]) && $forums[$row['forum_id']]))
{
$this->search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['poster_id'], $row['forum_id']);
}

8
phpBB/includes/functions_convert.php
View File

@@ -985,7 +985,7 @@ function set_user_options()
foreach ($keyoptions as $key => $key_ary)
{
$value = (isset($row[$key])) ? (int) $row[$key] : $key_ary['default'];
$value = (isset($convert_row[$key])) ? (int) $convert_row[$key] : $key_ary['default'];
if ($value && !($option_field & 1 << $key_ary['bit']))
{
@@ -1158,7 +1158,7 @@ function get_config()
}
else if ($convert->config_schema['table_format'] == 'file')
{
$filename = $convert->convertor_status['forum_path'] . '/' . $convert->config_schema['filename'];
$filename = $convert->options['forum_path'] . '/' . $convert->config_schema['filename'];
if (!file_exists($filename))
{
$convert->p_master->error($user->lang['FILE_NOT_FOUND'] . ': ' . $filename, __LINE__, __FILE__);
@@ -2278,7 +2278,7 @@ function relative_base($path, $is_relative = true, $line = false, $file = false)
return $path;
}
if (empty($convert->convertor_status['forum_path']) && $is_relative)
if (empty($convert->options['forum_path']) && $is_relative)
{
$line = $line ? $line : __LINE__;
$file = $file ? $file : __FILE__;
@@ -2286,7 +2286,7 @@ function relative_base($path, $is_relative = true, $line = false, $file = false)
$convert->p_master->error($user->lang['CONV_ERROR_NO_FORUM_PATH'], $line, $file);
}
return $convert->convertor_status['forum_path'] . '/' . $path;
return $convert->options['forum_path'] . '/' . $path;
}
?>

1
phpBB/includes/ucp/ucp_groups.php
View File

@@ -799,6 +799,7 @@ class ucp_groups
group_user_attributes('default', $group_id, $mark_ary, false, $group_row['group_name'], $group_row);
}
group_update_listings($group_id);
$user->add_lang('acp/groups');
trigger_error($user->lang['GROUP_DEFS_UPDATED'] . $return_page);