From 7e74aee1219019f01f61464d526d042edc12abf3 Mon Sep 17 00:00:00 2001 From: habarnam Date: Mon, 24 Mar 2008 19:37:14 +0200 Subject: [PATCH] * added the commits from work --- _pages/display/display.tpl | 6 +++--- _res/_libs/mysqlim.class.php | 3 ++- _res/_libs/tdoabstract.class.php | 5 ++++- _res/_libs/tspage.class.php | 11 +++++------ adm/_pages/upload/code.php | 1 - 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/_pages/display/display.tpl b/_pages/display/display.tpl index 4dffbfe..ded8707 100644 --- a/_pages/display/display.tpl +++ b/_pages/display/display.tpl @@ -1,8 +1,8 @@

{$title|ucwords|spacify}

{foreach from=$posts item=post} diff --git a/_res/_libs/mysqlim.class.php b/_res/_libs/mysqlim.class.php index 02e20c8..64c68ca 100644 --- a/_res/_libs/mysqlim.class.php +++ b/_res/_libs/mysqlim.class.php @@ -52,7 +52,8 @@ class mySqlIm extends interfaceSql { } public function __destruct() { - $this->close(); + if ($this->conn) + $this->close(); // if (!empty($this->link) && is_link($this->link)) // return mysql_close($this->link); } diff --git a/_res/_libs/tdoabstract.class.php b/_res/_libs/tdoabstract.class.php index eb4a2e6..235421c 100644 --- a/_res/_libs/tdoabstract.class.php +++ b/_res/_libs/tdoabstract.class.php @@ -1,6 +1,9 @@ +* @version 0.0.1 */ class tdoAbstract { diff --git a/_res/_libs/tspage.class.php b/_res/_libs/tspage.class.php index 22a8ec3..25ef7a6 100644 --- a/_res/_libs/tspage.class.php +++ b/_res/_libs/tspage.class.php @@ -223,14 +223,15 @@ class tsPage extends output { return; } - private function setOutput(){ + private function setOutput (){ $userAgent = $_SERVER['HTTP_USER_AGENT']; //return 'wml'; } - public function parse(){ - $this->setTheme(); - + public function parse (){ + $this->db->close(); + $this->setTheme(); + $this->smarty->compile_check = true; // $this->smarty->debugging = C_SYSTEM_DEBUG; $this->smarty->compile_dir = RES_PATH . S_C_TEMPL_DIR; @@ -295,8 +296,6 @@ class tsPage extends output { } echo str_replace(array('%TIME%','%QUERIES%'), array(number_format(microtime(true) - $GLOBALS['st'], 3, ',', '.'), $GLOBALS['qCnt']), $incString); - //var_dump($GLOBALS); -// var_dump($this->errors);die(); } } ?> diff --git a/adm/_pages/upload/code.php b/adm/_pages/upload/code.php index e9a438c..564a122 100644 --- a/adm/_pages/upload/code.php +++ b/adm/_pages/upload/code.php @@ -3,7 +3,6 @@ class upload extends tsAdminPage { public function __construct(){ parent::__construct(); - $this->varArray['title'] = 'adm'; $action = tsPage::getRequest('do'); -- 2.11.4.GIT