aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
Diffstat (limited to 'install')
-rw-r--r--install/database.sql7
-rw-r--r--install/update.php10
2 files changed, 11 insertions, 6 deletions
diff --git a/install/database.sql b/install/database.sql
index 5581a27c6..990399bc4 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -654,8 +654,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
`sexual` char(255) NOT NULL,
`politic` char(255) NOT NULL,
`religion` char(255) NOT NULL,
- `pub_keywords` text NOT NULL,
- `prv_keywords` text NOT NULL,
+ `keywords` text NOT NULL,
`likes` text NOT NULL,
`dislikes` text NOT NULL,
`about` text NOT NULL,
@@ -687,9 +686,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
KEY `hide_friends` (`hide_friends`),
KEY `postal_code` (`postal_code`),
KEY `country_name` (`country_name`),
- KEY `profile_guid` (`profile_guid`),
- FULLTEXT KEY `pub_keywords` (`pub_keywords`),
- FULLTEXT KEY `prv_keywords` (`prv_keywords`)
+ KEY `profile_guid` (`profile_guid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `profile_check` (
diff --git a/install/update.php b/install/update.php
index bdd687fb3..144a972f9 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1008 );
+define( 'UPDATE_VERSION' , 1009 );
/**
*
@@ -152,3 +152,11 @@ function update_r1007() {
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}
+
+function update_r1008() {
+ $r = q("alter table profile drop prv_keywords, CHANGE `pub_keywords` `keywords` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, drop index pub_keywords");
+
+ if($r)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+}