From ac64783a29d29c4bdc4dd4419e91085e8a7f2555 Mon Sep 17 00:00:00 2001 From: Dmitriy Simushev <simushevds@ossg.ru> Date: Mon, 16 Jul 2012 11:02:27 +0000 Subject: [PATCH] Moved database.php to libs/classes directory and related test case to tests/webim/libs/classes --- src/messenger/tests/webim/libs/{ => classes}/DatabaseTest.php | 4 ++-- src/messenger/webim/libs/{ => classes}/database.php | 0 src/messenger/webim/libs/common.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/messenger/tests/webim/libs/{ => classes}/DatabaseTest.php (97%) rename src/messenger/webim/libs/{ => classes}/database.php (100%) diff --git a/src/messenger/tests/webim/libs/DatabaseTest.php b/src/messenger/tests/webim/libs/classes/DatabaseTest.php similarity index 97% rename from src/messenger/tests/webim/libs/DatabaseTest.php rename to src/messenger/tests/webim/libs/classes/DatabaseTest.php index 7f123396..d3de1f4e 100644 --- a/src/messenger/tests/webim/libs/DatabaseTest.php +++ b/src/messenger/tests/webim/libs/classes/DatabaseTest.php @@ -1,7 +1,7 @@ <?php -require_once dirname(__FILE__) . '/../../../webim/libs/database.php'; -require_once dirname(__FILE__) . '/../../../webim/libs/config.php'; +require_once dirname(__FILE__) . '/../../../../webim/libs/classes/database.php'; +require_once dirname(__FILE__) . '/../../../../webim/libs/config.php'; /** * Test class for Database. diff --git a/src/messenger/webim/libs/database.php b/src/messenger/webim/libs/classes/database.php similarity index 100% rename from src/messenger/webim/libs/database.php rename to src/messenger/webim/libs/classes/database.php diff --git a/src/messenger/webim/libs/common.php b/src/messenger/webim/libs/common.php index 28f8d52f..ed262826 100644 --- a/src/messenger/webim/libs/common.php +++ b/src/messenger/webim/libs/common.php @@ -19,7 +19,7 @@ session_start(); require_once(dirname(__FILE__) . '/converter.php'); require_once(dirname(__FILE__) . '/config.php'); -require_once(dirname(__FILE__) . '/database.php'); +require_once(dirname(__FILE__) . '/classes/database.php'); $version = '1.6.5'; $jsver = "165";