1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00

PHP Notice/Warning removal. 'field-help' containers may now be customized with: data-placement="[top|right|bottom|left]"

This commit is contained in:
Cameron
2015-06-11 12:29:19 -07:00
parent 9af51e21db
commit 4414495b04
3 changed files with 14 additions and 4 deletions

View File

@@ -2435,6 +2435,9 @@ class pluginBuilder
$legacyFile = e_PLUGIN.$this->pluginName."/plugin.php";
if(file_exists($legacyFile))
{
$eplug_name = $eplug_author = $eplug_url = $eplug_description = "";
$eplug_tables = array();
require_once($legacyFile);
$mes = e107::getMessage();
$mes->addInfo("Loading plugin.php file");

View File

@@ -766,7 +766,7 @@ class e_parse extends e_parser
}
if(substr($text,0,6) == '[html]')
if(is_string($text) && substr($text,0,6) == '[html]')
{
// $text = $this->toHtml($text,true);
$search = array('"',''','\', '&',); // '&' must be last.
@@ -2838,7 +2838,7 @@ class e_parser
$doc->preserveWhiteSpace = true;
libxml_use_internal_errors(true);
$doc->loadHTML($html);
$doc->loadHTML($html);
$tg = explode(",", $taglist);
$ret = array();
@@ -3669,8 +3669,8 @@ return;
// Set it up for processing.
// libxml_use_internal_errors(true); // hides errors.
$doc = $this->domObj;
$doc = $this->domObj;
libxml_use_internal_errors(true);
@$doc->loadHTML($html);
// $doc->encoding = 'UTF-8';

View File

@@ -355,6 +355,13 @@ $(document).ready(function()
{
var placement = 'top';
}
var custplace = $(t).attr('data-placement'); // ie top|left|bottom|right
if(custplace !== undefined)
{
placement = custplace;
}
t.hide();