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

BC Fixes

Browse Source
This commit is contained in:
Cameron
2016-12-10 16:38:39 -08:00
parent 00959a7823
commit 268004bd71
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/form_handler.php
View File

@ -1730,7 +1730,7 @@ e107::getDebug()->log($sc_parameters);
$options['pattern'] = vartrue($options['pattern'],'[\S]{4,}'); $options['pattern'] = vartrue($options['pattern'],'[\S]{4,}');
$options['required'] = varset($options['required'], 1); $options['required'] = varset($options['required'], 1);
$options['class'] = vartrue($options['class'],'e-password'); $options['class'] = vartrue($options['class'],'e-password tbox');
e107::js('core', 'password/jquery.pwdMeter.js', 'jquery', 2); e107::js('core', 'password/jquery.pwdMeter.js', 'jquery', 2);

3
e107_handlers/shortcode_handler.php
View File

@ -100,6 +100,7 @@ class e_parse_shortcode
protected $sc_style = array(); // Former $sc_style global variable. Internally used - performance reasons protected $sc_style = array(); // Former $sc_style global variable. Internally used - performance reasons
protected $editableCodes = array(); // Array of editable shortcode data. protected $editableCodes = array(); // Array of editable shortcode data.
protected $editableActive = false; protected $editableActive = false;
protected $nowrap = false;
function __construct() function __construct()
{ {
@ -460,7 +461,7 @@ class e_parse_shortcode
// echo "<h3>Couldn't Find Class '".$className."' in <b>".$path."</b></h3>"; // echo "<h3>Couldn't Find Class '".$className."' in <b>".$path."</b></h3>";
} }
e107::getDebug()->log( "<div class='alert alert-danger'>Couldn't Load: <b>".$path."</b> with class-name:<b> {$className}</b> and pluginName <b>{$pluginName}</b></div>"); // e107::getDebug()->log( "<div class='alert alert-danger'>Couldn't Load: <b>".$path."</b> with class-name:<b> {$className}</b> and pluginName <b>{$pluginName}</b></div>");
// TODO - throw exception? // TODO - throw exception?

15
e107_plugins/forum/forum.php
View File

@ -306,21 +306,28 @@ str_replace("[x]", ($total_topics+$total_replies), LAN_FORUM_0031)." ($total_top
$FORUM_TEMPLATE = e107::getTemplate('forum','forum'); // required to use v2.x wrapper shortcode wrappers.
if(empty($FORUM_TEMPLATE)) //v1.x fallback.
if(empty($FORUM_TEMPLATE))
{ {
include(e_PLUGIN.'forum/templates/forum_template.php'); // include(e_PLUGIN.'forum/templates/forum_template.php');
// Override with theme template // Override with theme template
if (file_exists(THEME.'forum_template.php')) if (file_exists(THEME.'forum_template.php')) //v1.x fallback.
{ {
include(e_PLUGIN.'forum/templates/forum_template.php');
include_once(THEME.'forum_template.php'); include_once(THEME.'forum_template.php');
} }
elseif(file_exists(THEME.'templates/forum/forum_template.php')) elseif(file_exists(THEME.'templates/forum/forum_template.php'))
{ {
$FORUM_TEMPLATE = e107::getTemplate('forum','forum');
require_once(THEME.'templates/forum/forum_template.php'); require_once(THEME.'templates/forum/forum_template.php');
} }
else //v2.x
{
$FORUM_TEMPLATE = e107::getTemplate('forum','forum'); // required to use v2.x wrapper shortcode wrappers.
}
} }
if(is_array($FORUM_TEMPLATE) && deftrue('BOOTSTRAP',false)) // new v2.x format. if(is_array($FORUM_TEMPLATE) && deftrue('BOOTSTRAP',false)) // new v2.x format.