makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- new members of moderator groups should always become moderators [Bug #382]

Browse source 
- proper message when replying to non-existant topics [Bug #459]
- changed column type of search_array to store more ids [Bug #4058]
- fixed annoyance with font-size selector [Bug #4612]


git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@6749 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2006-12-11 23:30:12 +00:00
parent 0edf794be5
commit e105aa68bb
5 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/groupcp.php
View file

@ -418,21 +418,24 @@ else if ( $group_id )
FROM " . AUTH_ACCESS_TABLE . " aa FROM " . AUTH_ACCESS_TABLE . " aa
WHERE aa.group_id = g.group_id WHERE aa.group_id = g.group_id
) )
)"; )
ORDER BY aa.auth_mod DESC";
break; break;
case 'oracle': case 'oracle':
$sql = "SELECT g.group_moderator, g.group_type, aa.auth_mod $sql = "SELECT g.group_moderator, g.group_type, aa.auth_mod
FROM " . GROUPS_TABLE . " g, " . AUTH_ACCESS_TABLE . " aa FROM " . GROUPS_TABLE . " g, " . AUTH_ACCESS_TABLE . " aa
WHERE g.group_id = $group_id WHERE g.group_id = $group_id
AND aa.group_id (+) = g.group_id"; AND aa.group_id (+) = g.group_id
ORDER BY aa.auth_mod DESC";
break; break;
default: default:
$sql = "SELECT g.group_moderator, g.group_type, aa.auth_mod $sql = "SELECT g.group_moderator, g.group_type, aa.auth_mod
FROM ( " . GROUPS_TABLE . " g FROM ( " . GROUPS_TABLE . " g
LEFT JOIN " . AUTH_ACCESS_TABLE . " aa ON aa.group_id = g.group_id ) LEFT JOIN " . AUTH_ACCESS_TABLE . " aa ON aa.group_id = g.group_id )
WHERE g.group_id = $group_id"; WHERE g.group_id = $group_id
ORDER BY aa.auth_mod DESC";
break; break;
} }
if ( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )

2
phpBB/install/schemas/mysql_schema.sql
View file

@ -257,7 +257,7 @@ CREATE TABLE phpbb_search_results (
search_id int(11) UNSIGNED NOT NULL default '0', search_id int(11) UNSIGNED NOT NULL default '0',
session_id char(32) NOT NULL default '', session_id char(32) NOT NULL default '',
search_time int(11) DEFAULT '0' NOT NULL, search_time int(11) DEFAULT '0' NOT NULL,
search_array text NOT NULL, search_array mediumtext NOT NULL,
PRIMARY KEY (search_id), PRIMARY KEY (search_id),
KEY session_id (session_id) KEY session_id (session_id)
); );

15
phpBB/install/update_to_latest.php
View file

@ -657,6 +657,19 @@ switch ($row['config_value'])
break; break;
} }
break;
case '.0.21':
// MySQL only change
switch (SQL_LAYER)
{
case 'mysql':
case 'mysql4':
$sql[] = 'ALTER TABLE ' . SEARCH_TABLE . '
MODIFY COLUMN search_array MEDIUMTEXT NOT NULL';
}
break; break;
} }
@ -860,7 +873,7 @@ switch ($row['config_value'])
if (preg_match("#^lang_#i", $file) && !is_file($phpbb_root_path . $dirname . "/" . $file) && !is_link($phpbb_root_path . $dirname . "/" . $file) && file_exists($phpbb_root_path . $dirname . "/" . $file . '/search_stopwords.txt')) if (preg_match("#^lang_#i", $file) && !is_file($phpbb_root_path . $dirname . "/" . $file) && !is_link($phpbb_root_path . $dirname . "/" . $file) && file_exists($phpbb_root_path . $dirname . "/" . $file . '/search_stopwords.txt'))
{ {
$stopword_list = trim(preg_replace('#([\w\.\-_\+\'ąľ-˙\\\]+?)[ \n\r]*?(,|$)#', '\'\1\'\2', str_replace("'", "\'", implode(', ', file($phpbb_root_path . $dirname . "/" . $file . '/search_stopwords.txt'))))); $stopword_list = trim(preg_replace('#([\w\.\-_\+\'-\\\]+?)[ \n\r]*?(,|$)#', '\'\1\'\2', str_replace("'", "\'", implode(', ', file($phpbb_root_path . $dirname . "/" . $file . '/search_stopwords.txt')))));
$sql = "SELECT word_id $sql = "SELECT word_id
FROM " . SEARCH_WORD_TABLE . " FROM " . SEARCH_WORD_TABLE . "

3
phpBB/posting.php
View file

@ -222,9 +222,8 @@ switch ( $mode )
message_die(GENERAL_MESSAGE, $lang['No_valid_mode']); message_die(GENERAL_MESSAGE, $lang['No_valid_mode']);
} }
if ( $result = $db->sql_query($sql) ) if ( ($result = $db->sql_query($sql)) && ($post_info = $db->sql_fetchrow($result)) )
{ {
$post_info = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
$forum_id = $post_info['forum_id']; $forum_id = $post_info['forum_id'];

3
phpBB/templates/subSilver/posting_body.tpl
View file

@ -372,7 +372,8 @@ function storeCaret(textEl) {
<option style="color:violet; background-color: {T_TD_COLOR1}" value="violet" class="genmed">{L_COLOR_VIOLET}</option> <option style="color:violet; background-color: {T_TD_COLOR1}" value="violet" class="genmed">{L_COLOR_VIOLET}</option>
<option style="color:white; background-color: {T_TD_COLOR1}" value="white" class="genmed">{L_COLOR_WHITE}</option> <option style="color:white; background-color: {T_TD_COLOR1}" value="white" class="genmed">{L_COLOR_WHITE}</option>
<option style="color:black; background-color: {T_TD_COLOR1}" value="black" class="genmed">{L_COLOR_BLACK}</option> <option style="color:black; background-color: {T_TD_COLOR1}" value="black" class="genmed">{L_COLOR_BLACK}</option>
</select> &nbsp;{L_FONT_SIZE}:<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')"> </select> &nbsp;{L_FONT_SIZE}:<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.selectedIndex=0;" onMouseOver="helpline('f')">
<option value="0" class="genmed">{L_FONT_SIZE}</option>
<option value="7" class="genmed">{L_FONT_TINY}</option> <option value="7" class="genmed">{L_FONT_TINY}</option>
<option value="9" class="genmed">{L_FONT_SMALL}</option> <option value="9" class="genmed">{L_FONT_SMALL}</option>
<option value="12" selected class="genmed">{L_FONT_NORMAL}</option> <option value="12" selected class="genmed">{L_FONT_NORMAL}</option>