mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 14:46:56 +02:00
Code Issues Releases Wiki Activity

Issue #57 - fixes the error but doesn't correct a general issue with the way the mailout section is coded. Admin navigation is currently broken on some pages. Perhaps @e107steved has some answers.

Browse Source
This commit is contained in:
Cameron
2012-12-16 13:19:52 -08:00
parent a23d845054
commit 4bd6cd3dee
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/header.php
View File

@@ -110,7 +110,7 @@ e107::js("core", "core/admin.js","prototype",3); // Load all default functions.
if (isset($pref['del_unv']) && $pref['del_unv'] && $pref['user_reg_veri'] != 2) if (isset($pref['del_unv']) && $pref['del_unv'] && $pref['user_reg_veri'] != 2)
{ {
$threshold = (time() - ($pref['del_unv'] * 60)); $threshold = (time() - ($pref['del_unv'] * 60));
$sql->db_Delete("user", "user_ban = 2 AND user_join < '{$threshold}' "); e107::getDb()->db_Delete("user", "user_ban = 2 AND user_join < '{$threshold}' ");
} }
// //
@@ -423,7 +423,7 @@ if ($e107_popup != 1)
// (legacy?) function admin_purge_related moved to boot.php // (legacy?) function admin_purge_related moved to boot.php
$sql->db_Mark_Time('Parse Admin Header'); e107::getDb()->db_Mark_Time('Parse Admin Header');
//NEW - Iframe mod //NEW - Iframe mod
if (!deftrue('e_IFRAME')) if (!deftrue('e_IFRAME'))
@@ -432,7 +432,7 @@ if ($e107_popup != 1)
parse_admin($ADMIN_HEADER); parse_admin($ADMIN_HEADER);
} }
$sql->db_Mark_Time('(End: Parse Admin Header)'); e107::getDb()->db_Mark_Time('(End: Parse Admin Header)');
} }
// XXX - we don't need this (use e107::getMessage()) - find out what's using it and remove it // XXX - we don't need this (use e107::getMessage()) - find out what's using it and remove it

6
e107_handlers/e_parse_class.php
View File

@@ -1852,14 +1852,14 @@ class e_parse
'e_WEB_JS/' => '{e_WEB_JS}', 'e_WEB_JS/' => '{e_WEB_JS}',
'e_WEB_CSS/' => '{e_WEB_CSS}', 'e_WEB_CSS/' => '{e_WEB_CSS}',
'e_WEB_IMAGE/' => '{e_WEB_IMAGE}', 'e_WEB_IMAGE/' => '{e_WEB_IMAGE}',
'e_WEB_PACK/' => '{e_WEB_PACK}', // 'e_WEB_PACK/' => '{e_WEB_PACK}',
'e_BASE/' => '{e_BASE}', 'e_BASE/' => '{e_BASE}',
'e_ADMIN/' => '{e_ADMIN}', 'e_ADMIN/' => '{e_ADMIN}',
'e_IMAGE/' => '{e_IMAGE}', 'e_IMAGE/' => '{e_IMAGE}',
'e_THEME/' => '{e_THEME}', 'e_THEME/' => '{e_THEME}',
'e_PLUGIN/' => '{e_PLUGIN}', 'e_PLUGIN/' => '{e_PLUGIN}',
'e_HANDLER/' => '{e_WEB_PACK}', // BC 'e_HANDLER/' => '{e_HANDLER}', // BC
'e_MEDIA/' => '{e_MEDIA}', 'e_MEDIA/' => '{e_MEDIA}',
'e_WEB/' => '{e_ADMIN}', 'e_WEB/' => '{e_ADMIN}',
); );
@@ -2156,7 +2156,7 @@ class e_parse
'{e_WEB_JS}' => e_WEB_JS, '{e_WEB_JS}' => e_WEB_JS,
'{e_WEB_CSS}' => e_WEB_CSS, '{e_WEB_CSS}' => e_WEB_CSS,
'{e_WEB_IMAGE}' => e_WEB_IMAGE, '{e_WEB_IMAGE}' => e_WEB_IMAGE,
'{e_WEB_PACK}' => e_WEB_PACK, // '{e_WEB_PACK}' => e_WEB_PACK,
'{e_IMAGE}' => e_IMAGE, '{e_IMAGE}' => e_IMAGE,
'{e_PLUGIN}' => e_PLUGIN, '{e_PLUGIN}' => e_PLUGIN,