mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-05-05 03:38:29 +02:00
Code Issues Releases Wiki Activity

extremely bad dead loop fixed (see file comments); introducing new getConfig() method

Browse Source
This commit is contained in:
secretr 2010-10-28 13:31:54 +00:00
parent a930926479
commit 8250a97489
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
e107_handlers/mysql_class.php
View File

@ -21,8 +21,13 @@
* @package e107 * @package e107
* @subpackage e107_handlers * @subpackage e107_handlers
* @version $Id$; * @version $Id$;
*
* @todo separate cache for db type tables * @todo separate cache for db type tables
*
* WARNING!!! System config should be DIRECTLY called inside db handler like this:
* e107::getConfig('core', false);
* FALSE (don't load) is critical important - if missed, expect dead loop (preference handler is calling db handler as well
* when data is initally loaded)
* Always use $this->getConfig() method to avoid issues pointed above
*/ */
/* /*
@ -191,6 +196,14 @@ class e_db_mysql
return TRUE; return TRUE;
} }
/**
* Get system config
* @return e_core_pref
*/
public function getConfig()
{
return e107::getConfig('core', false);
}
/** /**
* @return void * @return void
@ -1010,7 +1023,9 @@ class e_db_mysql
global $pref; global $pref;
//When running a multi-language site with english included. English must be the main site language. //When running a multi-language site with english included. English must be the main site language.
$core_pref = e107::getConfig(); // WARNING!!! FALSE is critical important - if missed, expect dead loop (prefs are calling db handler as well when loading)
// Temporary solution, better one is needed
$core_pref = $this->getConfig();
//if ((!$this->mySQLlanguage || !$pref['multilanguage'] || $this->mySQLlanguage=='English') && $multiple==FALSE) //if ((!$this->mySQLlanguage || !$pref['multilanguage'] || $this->mySQLlanguage=='English') && $multiple==FALSE)
if ((!$this->mySQLlanguage || !$core_pref->get('multilanguage') || !$core_pref->get('sitelanguage') /*|| $this->mySQLlanguage==$core_pref->get('sitelanguage')*/) && $multiple==FALSE) if ((!$this->mySQLlanguage || !$core_pref->get('multilanguage') || !$core_pref->get('sitelanguage') /*|| $this->mySQLlanguage==$core_pref->get('sitelanguage')*/) && $multiple==FALSE)
{ {
@ -1589,7 +1604,8 @@ class e_db_mysql
else else
{ // Need to try and find a table definition { // Need to try and find a table definition
$searchArray = array(e_ADMIN.'sql/db_field_defs.php'); $searchArray = array(e_ADMIN.'sql/db_field_defs.php');
$sqlFiles = (array) e107::getPref('e_sql_list', array()); // kill any PHP notices // e107::getPref() shouldn't be used inside db handler! See db_IsLang() comments
$sqlFiles = (array) $this->getConfig()->get('e_sql_list', array()); // kill any PHP notices
foreach ($sqlFiles as $p => $f) foreach ($sqlFiles as $p => $f)
{ {
$searchArray[] = e_PLUGIN.$p.'/db_field_defs.php'; $searchArray[] = e_PLUGIN.$p.'/db_field_defs.php';