mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 22:27:34 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
e107_admin/plugin.php
View File

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

4
e107_handlers/e_parse_class.php
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); // $text = $this->toHtml($text,true);
$search = array('"',''','\', '&',); // '&' must be last. $search = array('"',''','\', '&',); // '&' must be last.
@@ -3670,7 +3670,7 @@ return;
// Set it up for processing. // Set it up for processing.
// libxml_use_internal_errors(true); // hides errors. // libxml_use_internal_errors(true); // hides errors.
$doc = $this->domObj; $doc = $this->domObj;
libxml_use_internal_errors(true);
@$doc->loadHTML($html); @$doc->loadHTML($html);
// $doc->encoding = 'UTF-8'; // $doc->encoding = 'UTF-8';

7
e107_web/js/core/admin.jquery.js
View File

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