diff --git a/.gitignore b/.gitignore index 82d92988e..3681a6045 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,8 @@ .project .htaccess e107_config.php +e107_config_*.php e107_media/* e107_system/* -e107_config.php /.settings e107_core/override diff --git a/e107_themes/bootstrap3/theme_shortcodes.php b/e107_themes/bootstrap3/theme_shortcodes.php index 865955b0c..840b3a676 100644 --- a/e107_themes/bootstrap3/theme_shortcodes.php +++ b/e107_themes/bootstrap3/theme_shortcodes.php @@ -120,8 +120,8 @@ class theme_shortcodes extends e_shortcode if(!empty($userReg)) // value of 1 or 2 = login okay. { - global $sc_style; - $sc_style = array(); // remove an wrappers. + // global $sc_style; // never use global - will impact signup/usersettings pages. + // $sc_style = array(); // remove any wrappers. $text .='