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

Solves the duplicate breadcrumb issue.

Browse Source
This commit is contained in:
Cameron
2020-12-28 09:48:44 -08:00
parent 48e3fdabc9
commit 10482b8a89
5 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
class2.php
View File

@@ -950,7 +950,7 @@ if (!class_exists('e107table', false))
} }
$bread = e107::breadcrumb(); $bread = e107::breadcrumb();
$ret['{---BREADCRUMB---}'] = e107::getForm()->breadcrumb($bread); $ret['{---BREADCRUMB---}'] = e107::getForm()->breadcrumb($bread, true);
return $ret; return $ret;

2
e107_handlers/db_debug_class.php
View File

@@ -835,7 +835,7 @@
$inc = array( $inc = array(
'BOOTSTRAP', 'HEADERF', 'FOOTERF', 'FILE_UPLOADS', 'FLOODPROTECT', 'FLOODTIMEOUT', 'FONTAWESOME', 'CHARSET', 'BOOTSTRAP', 'HEADERF', 'FOOTERF', 'FILE_UPLOADS', 'FLOODPROTECT', 'FLOODTIMEOUT', 'FONTAWESOME', 'CHARSET',
'GUESTS_ONLINE', 'MEMBERS_ONLINE', 'PAGE_NAME', 'STANDARDS_MODE', 'TIMEOFFSET', 'GUESTS_ONLINE', 'MEMBERS_ONLINE', 'PAGE_NAME', 'STANDARDS_MODE', 'TIMEOFFSET',
'TOTAL_ONLINE', 'THEME', 'THEME_ABS', 'THEME_LAYOUT', 'THEME_LEGACY', 'THEME_STYLE', 'META_OG', 'META_DESCRIPTION', 'MPREFIX', 'VIEWPORT', 'BODYTAG', 'CSSORDER' 'TOTAL_ONLINE', 'THEME', 'THEME_ABS', 'THEME_LAYOUT', 'THEME_LEGACY', 'THEME_VERSION', 'THEME_STYLE', 'META_OG', 'META_DESCRIPTION', 'MPREFIX', 'VIEWPORT', 'BODYTAG', 'CSSORDER'
); );
$userCon = get_defined_constants(true); $userCon = get_defined_constants(true);

14
e107_handlers/form_handler.php
View File

@@ -3586,12 +3586,18 @@ var_dump($select_options);*/
/** /**
* Render a Breadcrumb in Bootstrap format. * Render a Breadcrumb in Bootstrap format.
* @param $array * @param array $array
* @param $array[url] * @param $array[url]
* @param $array[text] * @param $array[text]
* @param bool $force - used internally to prevent duplicate {--BREADCUMB---} and template breadcrumbs from both displaying at once.
*/ */
public function breadcrumb($array) public function breadcrumb($array, $force = false)
{ {
if($force === false && defset('THEME_VERSION') === 2.3) // ignore template breadcrumb.
{
return null;
}
if(!is_array($array)){ return; } if(!is_array($array)){ return; }
$opt = array(); $opt = array();
@@ -3613,9 +3619,9 @@ var_dump($select_options);*/
} }
$ret = ''; $ret = '';
$ret .= vartrue($val['url']) ? "<a href='".$val['url']."'>" : ''; $ret .= !empty($val['url']) ? "<a href='".$val['url']."'>" : '';
$ret .= vartrue($val['text']); $ret .= vartrue($val['text']);
$ret .= vartrue($val['url']) ? '</a>' : ''; $ret .= !empty($val['url']) ? '</a>' : '';
if($ret != '') if($ret != '')
{ {

12
e107_handlers/theme_handler.php
View File

@@ -1134,6 +1134,17 @@ class e_theme
$legacy = (file_exists(e_THEME . $themeDir . '/theme.xml') === false); $legacy = (file_exists(e_THEME . $themeDir . '/theme.xml') === false);
define('THEME_LEGACY', $legacy); define('THEME_LEGACY', $legacy);
if($legacy === true)
{
$version = 1.0;
}
else
{
$version = (file_exists(e_THEME . $themeDir . '/theme.html')) ? 2.3 : 2.0;
}
define('THEME_VERSION', $version);
$e107->site_theme = $themeDir; $e107->site_theme = $themeDir;
e107::getDebug()->logTime('Theme Check End'); e107::getDebug()->logTime('Theme Check End');
@@ -1147,6 +1158,7 @@ class e_theme
$e107tmp_theme = 'bootstrap3'; // set to bootstrap3 by default. $e107tmp_theme = 'bootstrap3'; // set to bootstrap3 by default.
define('THEME', e_THEME . $e107tmp_theme . '/'); define('THEME', e_THEME . $e107tmp_theme . '/');
define('THEME_ABS', e_THEME_ABS . $e107tmp_theme . '/'); define('THEME_ABS', e_THEME_ABS . $e107tmp_theme . '/');
define('THEME_VERSION', 2.3);
if (ADMIN && strpos(e_SELF, $ADMIN_DIRECTORY) === false) if (ADMIN && strpos(e_SELF, $ADMIN_DIRECTORY) === false)
{ {

4
e107_plugins/download/download_shortcodes.php
View File

@@ -467,6 +467,8 @@ class download_shortcodes extends e_shortcode
function sc_download_list_icon($parm='') //XXX FIXME $img. function sc_download_list_icon($parm='') //XXX FIXME $img.
{ {
$img = "<img src='".IMAGE_DOWNLOAD."' alt='".LAN_DOWNLOAD."' title='".LAN_DOWNLOAD."' />";
if ($parm == "link") if ($parm == "link")
{ {
$url = e107::url('download', 'item', $this->var); $url = e107::url('download', 'item', $this->var);
@@ -884,7 +886,7 @@ class download_shortcodes extends e_shortcode
$img = '<i class="icon-download"></i>'; $img = '<i class="icon-download"></i>';
} }
return "<a href='".e_PLUGIN_ABS."download/download.php?mirror.{$this->var['download_id']}.{$this->mirror['dlmirrorfile'][0]}' title='".LAN_DOWNLOAD."'{$click}>".$img."</a>"; return "<a href='".e_PLUGIN_ABS."download/download.php?mirror.{$this->var['download_id']}.{$this->mirror['dlmirrorfile'][0]}' title='".LAN_DOWNLOAD."' {$click}>".$img."</a>";
} }
function sc_download_mirror_requests() function sc_download_mirror_requests()