mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-18 20:31:41 +02:00
Code Issues Releases Wiki Activity

Fixes database upgrade routines for v2.0+. Fixes #1231 (tablet navigation). Adds extra DB fields for future use.

Browse Source
This commit is contained in:
Cameron
2015-11-18 20:22:18 -08:00
parent cbfc73176b
commit e5ea9d689d
6 changed files with 138 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -723,7 +723,7 @@ class admin_shortcodes
$outboxUrl = e_PLUGIN.'pm/admin_config.php?mode=outbox&action=list&iframe=1';
$composeUrl = e_PLUGIN.'pm/admin_config.php?mode=outbox&action=create&iframe=1';
$text = '<ul class="nav navbar-nav nav-pills">
$text = '<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#" >
'.$tp->toGlyph('fa-envelope').$countDisp.'<b class="caret"></b>
@@ -1384,8 +1384,12 @@ Inverse 10 <span class="badge badge-inverse">10</span>
if($parm == 'home' || $parm == 'logout' || $parm == 'language' || $parm == 'pm')
{
$template = $$tmpl;
$template['start'] = $template['start_other'];
$menu_vars = $this->getOtherNav($parm);
return e107::getNav()->admin('', '', $menu_vars, $$tmpl, FALSE, FALSE);
return e107::getNav()->admin('', '', $menu_vars, $template, FALSE, FALSE);
}

2
e107_core/sql/core_sql.php
View File

@@ -361,6 +361,7 @@ CREATE TABLE online (
online_pagecount tinyint(3) unsigned NOT NULL default '0',
online_active int(10) unsigned NOT NULL default '0',
online_agent varchar(255) NOT NULL default '',
online_language varchar(45) NOT NULL default '',
KEY online_ip (online_ip)
) ENGINE=InnoDB;
# --------------------------------------------------------
@@ -567,6 +568,7 @@ CREATE TABLE userclass_classes (
userclass_visibility smallint(5) signed NOT NULL default '0',
userclass_type tinyint(1) unsigned NOT NULL default '0',
userclass_icon varchar(250) NOT NULL default '',
userclass_perms text NOT NULL,
PRIMARY KEY (userclass_id)
) ENGINE=MyISAM;
# --------------------------------------------------------