The branch, master has been updated via 4e94e3e35d3224c0672581c680edcbfea421ac9d (commit) via a1d61045025473ee37920f9e885b7997e7023c93 (commit) from aca93f450864947014d618c41c508d5522209d06 (commit)

- Log ----------------------------------------------------------------- commit 4e94e3e35d3224c0672581c680edcbfea421ac9d Author: Michal Čihař michal@cihar.com Date: Wed Aug 17 13:26:46 2011 +0200

Remove unused code

commit a1d61045025473ee37920f9e885b7997e7023c93 Author: Michal Čihař michal@cihar.com Date: Wed Aug 17 13:25:48 2011 +0200

Use Theme class for getting file name

-----------------------------------------------------------------------

Summary of changes: libraries/Theme_Manager.class.php | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 93f5ecf..c430974 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -236,8 +236,6 @@ class PMA_Theme_Manager // check for themes directory while (false !== ($PMA_Theme = readdir($handleThemes))) { if (array_key_exists($PMA_Theme, $this->themes)) { - // this does nothing! - //$this->themes[$PMA_Theme] = $this->themes[$PMA_Theme]; continue; } $new_theme = PMA_Theme::load($this->getThemesPath() . '/' . $PMA_Theme); @@ -323,8 +321,8 @@ class PMA_Theme_Manager /** * load layout file if exists */ - if (@file_exists($GLOBALS['pmaThemePath'] . 'layout.inc.php')) { - include $GLOBALS['pmaThemePath'] . 'layout.inc.php'; + if (file_exists($this->theme->getLayoutFile())) { + include $this->theme->getLayoutFile(); }

hooks/post-receive