From fdfb8ba1f3ffea312b37285103b73eb18bd8e273 Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 21 Nov 2013 19:41:29 -0800 Subject: [PATCH] Tweak of last commit --- e107_plugins/featurebox/includes/item.php | 2 +- e107_plugins/page/e_sitelink.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e107_plugins/featurebox/includes/item.php b/e107_plugins/featurebox/includes/item.php index a8c7a7a8d..7e7937213 100644 --- a/e107_plugins/featurebox/includes/item.php +++ b/e107_plugins/featurebox/includes/item.php @@ -127,7 +127,7 @@ class plugin_featurebox_item extends e_model parse_str($parm, $parm); $tp = e107::getParser(); - if($tp->thumbWidth > 100 && $tp->thumbHeight > 100) //Guessing it's a featurebox image. Use {SETIMAGE} inside theme.php to configure. + if($tp->thumbWidth > 100 || $tp->thumbHeight > 100) //Guessing it's a featurebox image. Use {SETIMAGE} inside theme.php to configure. { $src = $tp->thumbUrl($this->get('fb_image')); //XXX TODO TBD Add a pref to use without resizing? Or, detect {SETIMAGE} in template to enable? } diff --git a/e107_plugins/page/e_sitelink.php b/e107_plugins/page/e_sitelink.php index 1ee6946ee..84fcf2c7c 100644 --- a/e107_plugins/page/e_sitelink.php +++ b/e107_plugins/page/e_sitelink.php @@ -161,7 +161,7 @@ class page_sitelink // include plugin-folder in the name. 'link_parent' => $row['page_chapter'], 'link_open' => '', 'link_class' => intval($row['page_class']), - 'link_active' => ($options['cpage'] && $row['page_id'] == $options['cpage']) + 'link_active' => (isset($options['cpage']) && $row['page_id'] == $options['cpage']) ); } @@ -211,7 +211,7 @@ class page_sitelink // include plugin-folder in the name. 'link_open' => '', 'link_class' => 0, 'link_sub' => (!vartrue($options['book']) && !vartrue($options['auto'])) ? varset($sublinks[$row['chapter_id']]) : '', //XXX always test with docs template in bootstrap before changing. - 'link_active' => $row['chapter_parent'] == 0 ? $options['cbook'] && $options['cbook'] == $row['chapter_id'] : $options['cchapter'] && $options['cchapter'] == $row['chapter_id'], + 'link_active' => $row['chapter_parent'] == 0 ? isset($options['cbook']) && $options['cbook'] == $row['chapter_id'] : isset($options['cchapter']) && $options['cchapter'] == $row['chapter_id'], ); }