From 6008ed1933484048e9897b431f0cd122b603f1df Mon Sep 17 00:00:00 2001
From: inureyes <inureyes@gmail.com>
Date: Sat, 6 Feb 2010 04:45:11 +0000
Subject: [PATCH] =?UTF-8?q?=20refs=20#1431=20=20=20*=20=EB=8F=99=EC=A0=81?=
 =?UTF-8?q?=20=EB=A1=9C=EB=94=A9=20=EA=B4=80=EB=A0=A8=ED=95=98=EC=97=AC=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 interface/index.php      | 2 --
 library/plugins.php      | 7 +++++--
 library/preprocessor.php | 3 +--
 library/view/view.php    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/interface/index.php b/interface/index.php
index 14605fde3..e08a81fd0 100644
--- a/interface/index.php
+++ b/interface/index.php
@@ -57,7 +57,6 @@
 		header("Location: $blogURL/i"); exit;
 	}
 }
-
 publishEntries();
 
 if (!empty($_POST['mode']) && $_POST['mode'] == 'fb') { // Treat comment notifier.
@@ -70,7 +69,6 @@
 	notifyComment();
 }
 
-
 fireEvent('OBStart');
 
 if(empty($suri['id'])) {  // Without id.
diff --git a/library/plugins.php b/library/plugins.php
index cac6e0e1c..914a87292 100644
--- a/library/plugins.php
+++ b/library/plugins.php
@@ -13,7 +13,7 @@
 $adminMenuMappings    = array();
 $adminHandlerMappings = array();
 $configMappings       = array();
-$baseConfigPost = $service['path'].'/owner/setting/plugins/currentSetting';
+$baseConfigPost = $context->getProperty('service.path').'/owner/setting/plugins/currentSetting';
 $configPost  = '';
 $configVal   = '';
 $typeSchema  = null;
@@ -25,7 +25,10 @@
 if (getBlogId()) {
 	if($gCacheStorage->getContent('activePlugins')) $activePlugins = $gCacheStorage->getContent('activePlugins');
 	else {
-		$activePlugins = POD::queryColumn("SELECT name FROM {$database['prefix']}Plugins WHERE blogid = ".getBlogId());
+		$pool = DBModel::getInstance();
+		$pool->reset('Plugins');
+		$pool->setQualifier('blogid','eq',getBlogId());
+		$activePlugins = $pool->getColumn('name');
 		$gCacheStorage->setContent('activePlugins',$activePlugins);
 	}
 	$xmls = new XMLStruct();
diff --git a/library/preprocessor.php b/library/preprocessor.php
index 2af5f0052..009930e2b 100644
--- a/library/preprocessor.php
+++ b/library/preprocessor.php
@@ -61,9 +61,8 @@
 
 /// Loading configuration	
 $context = Model_Context::getInstance(); // automatic initialization via first instanciation
-//$config  = Model_Config::getInstance();
+$config  = Model_Config::getInstance();
 $uri     = Model_URIHandler::getInstance();
-
 /// Loading debug module
 if($context->getProperty('service.debugmode') == true) {
 	if(!is_null($context->getProperty('database.dbms'))) {
diff --git a/library/view/view.php b/library/view/view.php
index d75b4ae27..34046a4dd 100644
--- a/library/view/view.php
+++ b/library/view/view.php
@@ -94,7 +94,7 @@ function getUpperView($paging) {
 	<script type="text/javascript">
 	//<![CDATA[
 		var servicePath = "<?php echo $context->getProperty('service.path');?>";
-		var blogURL = "<?php echo $config->getProperty('uri.blog');?>";
+		var blogURL = "<?php echo $context->getProperty('uri.blog');?>";
 		var prevURL = "<?php echo isset($paging['prev']) ? escapeJSInCData("{$paging['url']}{$paging['prefix']}{$paging['prev']}{$paging['postfix']}") : '';?>";
 		var nextURL = "<?php echo isset($paging['next']) ? escapeJSInCData("{$paging['url']}{$paging['prefix']}{$paging['next']}{$paging['postfix']}") : '';?>";
 		var commentKey = "<?php echo md5(filemtime(ROOT . '/config.php'));?>";