|
From: Florin C B. <ory...@us...> - 2013-06-17 22:45:23
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1969 Modified Files: session.php Log Message: Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** session.php 17 Jun 2013 21:29:51 -0000 1.55 --- session.php 17 Jun 2013 22:45:21 -0000 1.56 *************** *** 1729,1733 **** } } ! $this->theme = &$row; $db->sql_freeresult($result); // User has wrong style --- 1729,1733 ---- } } ! $this->theme = is_array($this->theme) ? array_merge($this->theme, $row) : $row; $db->sql_freeresult($result); // User has wrong style *************** *** 1748,1752 **** AND i.imageset_id = s.imageset_id"; $result = $db->sql_query($sql, 3600); ! $this->theme = &$db->sql_fetchrow($result); $db->sql_freeresult($result); $style = $this->theme['style_id']; --- 1748,1752 ---- AND i.imageset_id = s.imageset_id"; $result = $db->sql_query($sql, 3600); ! $this->theme = is_array($this->theme) ? array_merge($this->theme, $db->sql_fetchrow($result)) : $db->sql_fetchrow($result); $db->sql_freeresult($result); $style = $this->theme['style_id']; *************** *** 1828,1832 **** $template->set_template(); ! $this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $this->encode_lang($board_config['default_lang']); --- 1828,1832 ---- $template->set_template(); ! $this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $this->encode_lang($board_config['default_lang']); |