mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-05 15:16:16 +02:00
- making user_last_search a NULL column so MSSQL won't hate us
- making ignore_words and synonyms optional for language packs git-svn-id: file:///svn/phpbb/trunk@5983 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
19a36ed364
commit
3752616bb6
@ -53,8 +53,11 @@ class search_backend
|
||||
|
||||
$words = array();
|
||||
|
||||
if (file_exists("{$user->lang_path}/search_ignore_words.$phpEx"))
|
||||
{
|
||||
// include the file containing ignore words
|
||||
include("{$user->lang_path}/search_ignore_words.$phpEx");
|
||||
}
|
||||
|
||||
$this->ignore_words = $words;
|
||||
unset($words);
|
||||
@ -72,8 +75,11 @@ class search_backend
|
||||
|
||||
$synonyms = array();
|
||||
|
||||
if (file_exists("{$user->lang_path}/search_synonyms.$phpEx"))
|
||||
{
|
||||
// include the file containing synonyms
|
||||
include("{$user->lang_path}/search_synonyms.$phpEx");
|
||||
}
|
||||
|
||||
$this->match_synonym = array_keys($synonyms);
|
||||
$this->replace_synonym = array_values($synonyms);
|
||||
|
@ -1331,7 +1331,7 @@ CREATE TABLE phpbb_users (
|
||||
user_lastpost_time INTEGER DEFAULT 0 NOT NULL,
|
||||
user_lastpage VARCHAR(200) DEFAULT '' NOT NULL,
|
||||
user_last_confirm_key VARCHAR(10) DEFAULT '',
|
||||
user_last_search INTEGER DEFAULT 0 NOT NULL,
|
||||
user_last_search INTEGER DEFAULT 0,
|
||||
user_warnings INTEGER DEFAULT 0,
|
||||
user_last_warning INTEGER DEFAULT 0,
|
||||
user_login_attempts INTEGER DEFAULT 0,
|
||||
|
@ -2128,7 +2128,7 @@ CREATE TABLE [phpbb_users] (
|
||||
[user_lastpost_time] [int] NOT NULL ,
|
||||
[user_lastpage] [varchar] (200) NOT NULL ,
|
||||
[user_last_confirm_key] [varchar] (10) NULL ,
|
||||
[user_last_search] [int] NOT NULL ,
|
||||
[user_last_search] [int] NULL ,
|
||||
[user_warnings] [int] NULL ,
|
||||
[user_last_warning] [int] NULL ,
|
||||
[user_login_attempts] [int] NULL ,
|
||||
|
@ -887,8 +887,8 @@ CREATE TABLE phpbb_users (
|
||||
user_lastmark int(11) DEFAULT '0' NOT NULL,
|
||||
user_lastpost_time int(11) DEFAULT '0' NOT NULL,
|
||||
user_lastpage varchar(200) DEFAULT '' NOT NULL,
|
||||
user_last_search int(11) DEFAULT '0' NOT NULL,
|
||||
user_last_confirm_key varchar(10) DEFAULT '' NULL,
|
||||
user_last_search int(11) DEFAULT '0' NULL,
|
||||
user_warnings tinyint(4) DEFAULT '0' NULL,
|
||||
user_last_warning int(11) DEFAULT '0' NULL,
|
||||
user_login_attempts smallint(4) DEFAULT '0' NULL,
|
||||
|
@ -1729,7 +1729,7 @@ CREATE TABLE phpbb_users (
|
||||
user_lastpost_time number(11) DEFAULT '0' NOT NULL,
|
||||
user_lastpage varchar2(200) DEFAULT '' NOT NULL,
|
||||
user_last_confirm_key varchar2(10) DEFAULT '' NULL,
|
||||
user_last_search number(11) DEFAULT '0' NOT NULL,
|
||||
user_last_search number(11) DEFAULT '0' NULL,
|
||||
user_warnings number(4) DEFAULT '0' NULL,
|
||||
user_last_warning number(11) DEFAULT '0' NULL,
|
||||
user_login_attempts number(4) DEFAULT '0' NULL,
|
||||
|
@ -1305,7 +1305,7 @@ CREATE TABLE phpbb_users (
|
||||
user_lastpost_time INT4 DEFAULT '0' NOT NULL,
|
||||
user_lastpage varchar(200) DEFAULT '' NOT NULL,
|
||||
user_last_confirm_key varchar(10) DEFAULT '' NULL,
|
||||
user_last_search INT4 DEFAULT '0' NOT NULL,
|
||||
user_last_search INT4 DEFAULT '0' NULL,
|
||||
user_warnings INT2 DEFAULT '0' NULL,
|
||||
user_last_warning INT4 DEFAULT '0' NULL,
|
||||
user_login_attempts INT2 DEFAULT '0' NULL,
|
||||
|
@ -950,7 +950,7 @@ CREATE TABLE phpbb_users (
|
||||
user_lastpost_time int(11) NOT NULL DEFAULT '0',
|
||||
user_lastpage varchar(200) NOT NULL DEFAULT '',
|
||||
user_last_confirm_key varchar(10) NULL DEFAULT '',
|
||||
user_last_search int(11) NOT NULL DEFAULT '0',
|
||||
user_last_search int(11) NULL DEFAULT '0',
|
||||
user_warnings tinyint(4) NULL DEFAULT '0',
|
||||
user_last_warning int(11) NULL DEFAULT '0',
|
||||
user_login_attempts smallint(4) NULL DEFAULT '0',
|
||||
|
Loading…
x
Reference in New Issue
Block a user