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

Merging with upstream

Browse Source
This commit is contained in:
Deltik
2013-05-07 08:15:48 -05:00
parent 45ef27745b ebcf1e0169
commit fe2662188e
21 changed files with 360 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
e107_core/shortcodes/single/navigation.php
View File

@@ -18,5 +18,6 @@ function navigation_shortcode($parm='')
// $data = $nav->collection($category);
return $nav->render($data, $template);
}

2
e107_core/templates/header_default.php
View File

@@ -625,7 +625,7 @@ if ($e107_popup != 1) {
if(ADMIN)
{
if(file_exists(e_BASE.'install.php')){ echo "<div class='installer'><br /><b>*** ".CORE_LAN4." ***</b><br />".CORE_LAN5."</div><br /><br />"; }
if(file_exists(e_BASE.'install.php') || file_exists(e_BASE.'install_.php')){ echo "<div class='installer alert alert-danger alert-block text-center'><b>*** ".CORE_LAN4." ***</b><br />".CORE_LAN5."</div>"; }
}
// Display Welcome Message when old method activated.