makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix huge memory hog. :) (how dumb i was... hmm...)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4962 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2004-08-15 12:06:05 +00:00
parent 5f8dc3ca0e
commit 2706ce6534
1 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
phpBB/includes/session.php
View file

@ -538,6 +538,10 @@ class user extends session
} }
} }
// We include common language file here to not load it every time a custom language file is included
$lang = &$this->lang;
require($this->lang_path . "common.$phpEx");
$this->add_lang($lang_set); $this->add_lang($lang_set);
unset($lang_set); unset($lang_set);
@ -644,11 +648,7 @@ class user extends session
// $lang_set = array('help' => 'faq', 'db' => array('help:faq', 'posting')) // $lang_set = array('help' => 'faq', 'db' => array('help:faq', 'posting'))
function add_lang($lang_set, $use_db = false, $use_help = false) function add_lang($lang_set, $use_db = false, $use_help = false)
{ {
global $lang, $help, $phpEx; global $phpEx;
$lang = array();
require($this->lang_path . "common.$phpEx");
if (is_array($lang_set)) if (is_array($lang_set))
{ {
@ -668,7 +668,7 @@ class user extends session
} }
else if (!is_array($lang_file)) else if (!is_array($lang_file))
{ {
$this->set_lang($lang_file, $use_db, $use_help); $this->set_lang($this->lang, $this->help, $lang_file, $use_db, $use_help);
} }
else else
{ {
@ -679,30 +679,21 @@ class user extends session
} }
else if ($lang_set) else if ($lang_set)
{ {
$this->set_lang($lang_set, $use_db, $use_help); $this->set_lang($this->lang, $this->help, $lang_set, $use_db, $use_help);
}
if ($use_help || sizeof($help))
{
$this->help += $help;
unset($help);
}
if (sizeof($lang))
{
$this->lang += $lang;
// Yes, we unset $lang here, this variable is in use elsewhere
unset($lang);
} }
} }
function set_lang($lang_file, $use_db = false, $use_help = false) function set_lang(&$lang, &$help, $lang_file, $use_db = false, $use_help = false)
{ {
global $lang, $help, $phpEx; global $phpEx;
// $lang == $this->lang
// $help == $this->help
// - add appropiate variables here, name them as they are used within the language file...
if (!$use_db) if (!$use_db)
{ {
require ($this->lang_path . (($use_help) ? 'help_' : '') . "$lang_file.$phpEx"); require($this->lang_path . (($use_help) ? 'help_' : '') . "$lang_file.$phpEx");
} }
else if ($use_db) else if ($use_db)
{ {