mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-07 07:06:30 +02:00
Code Issues Releases Wiki Activity

PHP Notice removal

Browse Source
This commit is contained in:
Cameron
2015-03-07 16:31:13 -08:00
parent 1e5ab81afe
commit 85f30c0292
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/e107_class.php
View File

@@ -1870,7 +1870,7 @@ class e107
* Safe way to call user methods. * Safe way to call user methods.
* @param string|object $class_name * @param string|object $class_name
* @param string $method_name * @param string $method_name
* @return boolean FALSE * @return array|boolean FALSE
*/ */
public static function callMethod($class_name, $method_name, $param='') public static function callMethod($class_name, $method_name, $param='')
{ {

5
e107_handlers/e_parse_class.php
View File

@@ -3165,7 +3165,7 @@ class e_parser
*/ */
public function cleanHtml($html='', $checkPref = true) public function cleanHtml($html='', $checkPref = true)
{ {
if(empty($html)){ return; } if(empty($html)){ return ''; }
// $html = mb_convert_encoding($html, 'UTF-8'); // $html = mb_convert_encoding($html, 'UTF-8');
@@ -3269,10 +3269,13 @@ class e_parser
} }
// required - removing attributes in a loop breaks the loop // required - removing attributes in a loop breaks the loop
if(!empty($removeAttributes))
{
foreach ($removeAttributes as $name) foreach ($removeAttributes as $name)
{ {
$node->removeAttribute($name); $node->removeAttribute($name);
} }
}
} }

12
e107_handlers/plugin_class.php
View File

@@ -2986,9 +2986,19 @@ class e107plugin
// Called to parse the (deprecated) plugin.php file // Called to parse the (deprecated) plugin.php file
function parse_plugin_php($plugName) function parse_plugin_php($plugName)
{ {
$mes = e107::getMessage();
$tp = e107::getParser(); $tp = e107::getParser();
$eplug_conffile = null;
$eplug_table_names = null;
$eplug_prefs = null;
$eplug_module = null;
$eplug_userclass = null;
$eplug_status = null;
$eplug_latest = null;
$eplug_icon = null;
$eplug_icon_small = null;
if (include(e_PLUGIN.$plugName.'/plugin.php')) if (include(e_PLUGIN.$plugName.'/plugin.php'))
{ {
//$mes->add("Loading ".e_PLUGIN.$plugName.'/plugin.php', E_MESSAGE_DEBUG); //$mes->add("Loading ".e_PLUGIN.$plugName.'/plugin.php', E_MESSAGE_DEBUG);