aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-07-13 20:53:48 -0700
committerNils Adermann <naderman@naderman.de>2013-07-13 20:53:48 -0700
commit4186c05bb4b97374392031a10b796e77b857afaf (patch)
tree6250b85f7efa6f752cb236a5ec29b4d121a0ef53
parent6946cea72dae098599e1964c983d373bdd52324b (diff)
parent176729ab001300c295695537803f389e175049cf (diff)
downloadforums-4186c05bb4b97374392031a10b796e77b857afaf.tar
forums-4186c05bb4b97374392031a10b796e77b857afaf.tar.gz
forums-4186c05bb4b97374392031a10b796e77b857afaf.tar.bz2
forums-4186c05bb4b97374392031a10b796e77b857afaf.tar.xz
forums-4186c05bb4b97374392031a10b796e77b857afaf.zip
Merge pull request #1555 from EXreaction/ticket/11692
[ticket/11692] Don't update search_type in dev migration if already appended
-rw-r--r--phpBB/includes/db/migration/data/310/dev.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index 13b36bbf30..0fc2950987 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -82,7 +82,10 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
public function update_data()
{
return array(
- array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
+ array('if', array(
+ (strpos('phpbb_search_', $this->config['search_type']) !== 0),
+ array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
+ )),
array('config.add', array('fulltext_postgres_ts_name', 'simple')),
array('config.add', array('fulltext_postgres_min_word_len', 4)),