1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 03:24:20 +02:00

#125 - require_once() clean-up, also header and various other clean-up

This commit is contained in:
Tijn Kuyper
2013-02-27 15:18:48 +01:00
parent 8e6d5fbaeb
commit e2a9133e80
5 changed files with 62 additions and 101 deletions

View File

@@ -2,16 +2,10 @@
/*
* e107 website system
*
* Copyright (C) 2008-2009 e107 Inc (e107.org)
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
*
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/e_upgrade_class.php,v $
* $Revision$
* $Date$
* $Author$
*/
if (!defined('e107_INIT')) { exit; }
@@ -70,9 +64,8 @@ class e_upgrade
if(($cache==TRUE) && ($cacheData = $e107cache->retrieve($cacheString, 3600, TRUE)))
{
require_once(e_HANDLER."message_handler.php");
$emessage = &eMessage::getInstance();
$emessage->add($cacheData);
$mes = e107::getMessage();
$mes->addInfo($cacheData);
$e107cache->CachePageMD5 = "";
return;
}
@@ -111,9 +104,7 @@ class e_upgrade
if($txt)
{
require_once (e_HANDLER."message_handler.php");
$emessage = &eMessage::getInstance();
$emessage->add($txt);
$mes->addInfo($txt);
if($cache==TRUE)
{
$e107cache->set($cacheString, $txt, TRUE);
@@ -128,10 +119,9 @@ class e_upgrade
function checkAllPlugins()
{
global $pref;
$pref = e107::getPref();
$sql = e107::getDB();
if($sql -> db_Select_Gen("SELECT * FROM #plugin WHERE plugin_installflag = 1 AND plugin_releaseUrl !=''"))
{
@@ -162,6 +152,4 @@ class e_upgrade
}
}
}