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

Minor alteration

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4847 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2004-02-29 12:51:18 +00:00
parent 85c25a5b17
commit e84a8dc12c
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
phpBB/includes/session.php
View file

@ -515,7 +515,6 @@ class user extends session
} }
} }
include($this->lang_path . '/common.' . $phpEx);
$this->add_lang($lang_set); $this->add_lang($lang_set);
unset($lang_set); unset($lang_set);
@ -523,8 +522,7 @@ class user extends session
{ {
global $SID; global $SID;
$style = intval($_GET['style']); $SID .= '&style=' . request_var('style', 0);
$SID .= '&style=' . $style;
} }
else else
{ {
@ -573,23 +571,6 @@ class user extends session
return; return;
} }
// Internal usage
function set_lang($lang_file, $use_db = false, $use_help = false)
{
global $lang, $help, $phpEx;
if (!$use_db)
{
include($this->lang_path . '/' . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx);
}
else if ($use_db)
{
// Get Database Language Strings
// Put them into $lang if nothing is prefixed, put them into $help if help: is prefixed
// For example: help:faq, posting
}
}
// Add Language Items - use_db and use_help are assigned where needed (only use them to force inclusion) // Add Language Items - use_db and use_help are assigned where needed (only use them to force inclusion)
// //
// $lang_set = array('posting', 'help' => 'faq'); // $lang_set = array('posting', 'help' => 'faq');
@ -601,11 +582,14 @@ class user extends session
{ {
global $lang, $help, $phpEx; global $lang, $help, $phpEx;
$lang = array();
require($this->lang_path . "common.$phpEx");
if (is_array($lang_set)) if (is_array($lang_set))
{ {
foreach ($lang_set as $key => $lang_file) foreach ($lang_set as $key => $lang_file)
{ {
$key = (string) $key;
if ($key == 'db') if ($key == 'db')
{ {
$this->add_lang($lang_file, true, $use_help); $this->add_lang($lang_file, true, $use_help);
@ -644,6 +628,22 @@ class user extends session
} }
} }
function set_lang($lang_file, $use_db = false, $use_help = false)
{
global $lang, $help, $phpEx;
if (!$use_db)
{
require($this->lang_path . (($use_help) ? 'help_' : '') . "$lang_file.$phpEx");
}
else if ($use_db)
{
// Get Database Language Strings
// Put them into $lang if nothing is prefixed, put them into $help if help: is prefixed
// For example: help:faq, posting
}
}
function format_date($gmepoch, $format = false) function format_date($gmepoch, $format = false)
{ {
static $lang_dates; static $lang_dates;