From db3bddf15c4de1b75b0831be73aec24a44230ed4 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 21 Jul 2014 11:29:37 +0200
Subject: [PATCH 1/2] [ticket/12882] Update search_type when it's not prefixed
 by phpbb_search

PHPBB3-12882
---
 phpBB/phpbb/db/migration/data/v310/namespaces.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/phpBB/phpbb/db/migration/data/v310/namespaces.php b/phpBB/phpbb/db/migration/data/v310/namespaces.php
index 2a4935395e..709317023a 100644
--- a/phpBB/phpbb/db/migration/data/v310/namespaces.php
+++ b/phpBB/phpbb/db/migration/data/v310/namespaces.php
@@ -25,6 +25,10 @@ class namespaces extends \phpbb\db\migration\migration
 	public function update_data()
 	{
 		return array(
+			array('if', array(
+				(is_file($this->phpbb_root_path . 'phpbb/search/' . $this->config['search_type'] . $this->php_ext)),
+				array('config.update', array('search_type', '\\phpbb\\search\\' . $this->config['search_type'])),
+			)),
 			array('if', array(
 				(preg_match('#^phpbb_search_#', $this->config['search_type'])),
 				array('config.update', array('search_type', str_replace('phpbb_search_', '\\phpbb\\search\\', $this->config['search_type']))),

From 2fbf12456d6f8c63de261eb7950e700db6f9d346 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 21 Jul 2014 17:48:50 +0200
Subject: [PATCH 2/2] [ticket/12882] Use a new migration

PHPBB3-12882
---
 .../db/migration/data/v310/namespaces.php     |  4 ---
 .../db/migration/data/v310/search_type.php    | 34 +++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 phpBB/phpbb/db/migration/data/v310/search_type.php

diff --git a/phpBB/phpbb/db/migration/data/v310/namespaces.php b/phpBB/phpbb/db/migration/data/v310/namespaces.php
index 709317023a..2a4935395e 100644
--- a/phpBB/phpbb/db/migration/data/v310/namespaces.php
+++ b/phpBB/phpbb/db/migration/data/v310/namespaces.php
@@ -25,10 +25,6 @@ class namespaces extends \phpbb\db\migration\migration
 	public function update_data()
 	{
 		return array(
-			array('if', array(
-				(is_file($this->phpbb_root_path . 'phpbb/search/' . $this->config['search_type'] . $this->php_ext)),
-				array('config.update', array('search_type', '\\phpbb\\search\\' . $this->config['search_type'])),
-			)),
 			array('if', array(
 				(preg_match('#^phpbb_search_#', $this->config['search_type'])),
 				array('config.update', array('search_type', str_replace('phpbb_search_', '\\phpbb\\search\\', $this->config['search_type']))),
diff --git a/phpBB/phpbb/db/migration/data/v310/search_type.php b/phpBB/phpbb/db/migration/data/v310/search_type.php
new file mode 100644
index 0000000000..f89456ae19
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/search_type.php
@@ -0,0 +1,34 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class search_type extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v310\dev',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('if', array(
+				(is_file($this->phpbb_root_path . 'phpbb/search/' . $this->config['search_type'] . $this->php_ext)),
+				array('config.update', array('search_type', '\\phpbb\\search\\' . $this->config['search_type'])),
+			)),
+		);
+	}
+}