aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-05-28 19:24:13 +0000
committerNils Adermann <naderman@naderman.de>2006-05-28 19:24:13 +0000
commit3752616bb6317875708ed9cfc5296d784566c657 (patch)
tree3d36fbb7cb2137c59358cc64d3debb08e8c4220f /phpBB
parent19a36ed364ffdc4da784a253baa8aa2a8ac6845a (diff)
downloadforums-3752616bb6317875708ed9cfc5296d784566c657.tar
forums-3752616bb6317875708ed9cfc5296d784566c657.tar.gz
forums-3752616bb6317875708ed9cfc5296d784566c657.tar.bz2
forums-3752616bb6317875708ed9cfc5296d784566c657.tar.xz
forums-3752616bb6317875708ed9cfc5296d784566c657.zip
- 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
Diffstat (limited to 'phpBB')
-rwxr-xr-xphpBB/includes/search/search.php14
-rw-r--r--phpBB/install/schemas/firebird_schema.sql2
-rw-r--r--phpBB/install/schemas/mssql_schema.sql2
-rw-r--r--phpBB/install/schemas/mysql_schema.sql2
-rw-r--r--phpBB/install/schemas/oracle_schema.sql2
-rw-r--r--phpBB/install/schemas/postgres_schema.sql2
-rw-r--r--phpBB/install/schemas/sqlite_schema.sql2
7 files changed, 16 insertions, 10 deletions
diff --git a/phpBB/includes/search/search.php b/phpBB/includes/search/search.php
index 28f805bca5..ddf5ca9796 100755
--- a/phpBB/includes/search/search.php
+++ b/phpBB/includes/search/search.php
@@ -53,8 +53,11 @@ class search_backend
$words = array();
- // include the file containing ignore words
- include("{$user->lang_path}/search_ignore_words.$phpEx");
+ 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();
- // include the file containing synonyms
- include("{$user->lang_path}/search_synonyms.$phpEx");
+ 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);
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 93c0340fc7..b2dd3aa0f2 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -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,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 2756815c97..a5406b51c0 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -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 ,
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index bd00968c39..8d7318e682 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -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,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index b58407fd82..2a41231626 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -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,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 9b3b3f20b5..e0157b7efd 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -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,
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 3bf6ac0c36..5cba79713f 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -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',
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-12 15:28:54 +0000