mirror of
https://github.com/e107inc/e107.git
synced 2025-08-03 21:27:25 +02:00
Small changes
This commit is contained in:
11
class2.php
11
class2.php
@@ -11,8 +11,8 @@
|
|||||||
| GNU General Public License (http://gnu.org).
|
| GNU General Public License (http://gnu.org).
|
||||||
|
|
|
|
||||||
| $Source: /cvs_backup/e107_0.8/class2.php,v $
|
| $Source: /cvs_backup/e107_0.8/class2.php,v $
|
||||||
| $Revision: 1.83 $
|
| $Revision: 1.84 $
|
||||||
| $Date: 2008-12-03 15:05:52 $
|
| $Date: 2008-12-04 21:05:05 $
|
||||||
| $Author: mcfly_e107 $
|
| $Author: mcfly_e107 $
|
||||||
+----------------------------------------------------------------------------+
|
+----------------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
@@ -638,8 +638,9 @@ $e107->override = new override;
|
|||||||
$override = &$e107->override;
|
$override = &$e107->override;
|
||||||
|
|
||||||
e107_require_once(e_HANDLER.'userclass_class.php');
|
e107_require_once(e_HANDLER.'userclass_class.php');
|
||||||
$e107->e_userclass = new user_class;
|
$e107->e_userclass = new e_userclass;
|
||||||
$e_userclass = &$e107->e_userclass;
|
$e107->user_class = new user_class;
|
||||||
|
$e_userclass = &$e107->user_class;
|
||||||
|
|
||||||
if(isset($pref['notify']) && $pref['notify'] == true)
|
if(isset($pref['notify']) && $pref['notify'] == true)
|
||||||
{
|
{
|
||||||
@@ -1288,7 +1289,7 @@ function get_user_data($uid, $extra = '')
|
|||||||
|
|
||||||
//===========================================================
|
//===========================================================
|
||||||
// Now look up the 'inherited' user classes
|
// Now look up the 'inherited' user classes
|
||||||
$var['user_class'] = $e107->e_userclass->get_all_user_classes($var['user_class']);
|
$var['user_class'] = $e107->user_class->get_all_user_classes($var['user_class']);
|
||||||
|
|
||||||
//===========================================================
|
//===========================================================
|
||||||
|
|
||||||
|
@@ -6,16 +6,17 @@
|
|||||||
| Released under the terms and conditions of the GNU General Public License (http://gnu.org).
|
| Released under the terms and conditions of the GNU General Public License (http://gnu.org).
|
||||||
|
|
|
|
||||||
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/header_default.php,v $
|
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/header_default.php,v $
|
||||||
| $Revision: 1.25 $
|
| $Revision: 1.26 $
|
||||||
| $Date: 2008-11-21 11:12:06 $
|
| $Date: 2008-12-04 21:05:05 $
|
||||||
| $Author: secretr $
|
| $Author: mcfly_e107 $
|
||||||
+-----------------------------------------------------------------------------------------------+
|
+-----------------------------------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (!defined('e107_INIT')) { exit; }
|
if (!defined('e107_INIT')) { exit; }
|
||||||
define("USER_AREA",TRUE);
|
define("USER_AREA",TRUE);
|
||||||
define("ADMIN_AREA",FALSE);
|
define("ADMIN_AREA",FALSE);
|
||||||
$sql->db_Mark_Time('(Header Top)');
|
$e107 = e107::getInstance();
|
||||||
|
$e107->sql->db_Mark_Time('(Header Top)');
|
||||||
|
|
||||||
//
|
//
|
||||||
// *** Code sequence for headers ***
|
// *** Code sequence for headers ***
|
||||||
@@ -396,7 +397,7 @@ echo "</script>\n";
|
|||||||
|
|
||||||
echo "</head>
|
echo "</head>
|
||||||
<body".$body_onload.">\n";
|
<body".$body_onload.">\n";
|
||||||
$sql->db_Mark_Time("Main Page Body");
|
$e107->sql->db_Mark_Time("Main Page Body");
|
||||||
|
|
||||||
//
|
//
|
||||||
// K: (The rest is ignored for popups, which have no menus)
|
// K: (The rest is ignored for popups, which have no menus)
|
||||||
@@ -504,7 +505,7 @@ if ($e107_popup != 1) {
|
|||||||
|
|
||||||
// Display Welcome Message when old method activated.
|
// Display Welcome Message when old method activated.
|
||||||
|
|
||||||
echo $tp->parseTemplate("{WMESSAGE=header}");
|
echo $e107->tp->parseTemplate("{WMESSAGE=header}");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user