From b8844e3734d268a3de9a8774823617e285124788 Mon Sep 17 00:00:00 2001
From: Mzhelskiy Maxim <rus.engine@gmail.com>
Date: Tue, 29 Apr 2014 13:12:05 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B5=D0=B3=D0=BE=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/config/modules/search/config.php | 26 --------------------
 framework                                    |  2 +-
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 application/config/modules/search/config.php

diff --git a/application/config/modules/search/config.php b/application/config/modules/search/config.php
deleted file mode 100644
index a1cb5b6d..00000000
--- a/application/config/modules/search/config.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*-------------------------------------------------------
-*
-*   LiveStreet Engine Social Networking
-*   Copyright © 2008 Mzhelskiy Maxim
-*
-*--------------------------------------------------------
-*
-*   Official site: www.livestreet.ru
-*   Contact e-mail: rus.engine@gmail.com
-*
-*   GNU General Public License, version 2:
-*   http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-*
----------------------------------------------------------
-*/
-
-/**
- * Конфиг модуля "search"
- */
-$config['entity_prefix']  = '';
-$config['sphinx']['host'] = 'localhost';
-$config['sphinx']['port'] = '3312';
-
-return $config;
-?>
\ No newline at end of file
diff --git a/framework b/framework
index 56cad71e..d9358f8c 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 56cad71e524dd4a043cae42efbb37d591efc3f4e
+Subproject commit d9358f8c43c989e62afad078fc380545880717ba