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

Notice and Warning removals

Browse Source
This commit is contained in:
Cameron
2013-04-15 19:46:35 -07:00
parent 0f6c1704de
commit 792c5eb628
5 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_admin/update_routines.php
View File

@ -964,8 +964,16 @@ function update_706_to_800($type='')
require_once(e_HANDLER."db_verify_class.php"); require_once(e_HANDLER."db_verify_class.php");
$dbv = new db_verify; $dbv = new db_verify;
$exclude = array_keys(e107::getPlugin()->updateRequired()); // search xxxxx_setup.php and check for 'upgrade_required()' == true.
if($plugUpgradeReq = e107::getPlugin()->updateRequired())
{
$exclude = array_keys($plugUpgradeReq); // search xxxxx_setup.php and check for 'upgrade_required()' == true.
}
else
{
$exclude = false;
}
$dbv->compareAll($exclude); // core & plugins, but not plugins calling for an update with xxxxx_setup.php $dbv->compareAll($exclude); // core & plugins, but not plugins calling for an update with xxxxx_setup.php
if(count($dbv->errors)) if(count($dbv->errors))

2
e107_core/bbcodes/bb_img.php
View File

@ -81,7 +81,7 @@ class bb_img extends e_bb_base
parse_str($parm,$imgParms); parse_str($parm,$imgParms);
foreach($tmp as $p => $v) // foreach($tmp as $p => $v)
{ {
// $imgParms[$p]=$v; // $imgParms[$p]=$v;
} }

10
e107_handlers/db_verify_class.php
View File

@ -157,11 +157,15 @@ class db_verify
* Check core tables and installed plugin tables * Check core tables and installed plugin tables
* @param $exclude - array of plugins to exclude. * @param $exclude - array of plugins to exclude.
*/ */
function compareAll($exclude = array()) function compareAll($exclude = null)
{ {
foreach($exclude as $val)
if(is_array($exclude))
{ {
unset($this->tables[$val]); foreach($exclude as $val)
{
unset($this->tables[$val]);
}
} }
$dtables = array_keys($this->tables); $dtables = array_keys($this->tables);

7
e107_handlers/theme_handler.php
View File

@ -1356,10 +1356,15 @@ class themeHandler
$core->set('sitetheme_layouts', $layout); $core->set('sitetheme_layouts', $layout);
$core->set('sitetheme_deflayout', $deflayout); $core->set('sitetheme_deflayout', $deflayout);
$core->set('sitetheme_custompages', $customPages); $core->set('sitetheme_custompages', $customPages);
$core->set('sitetheme_version', $version); $core->set('sitetheme_version', $version);
// $core->set('sitetheme_releaseUrl', $this->themeArray[$name]['releaseUrl']); // $core->set('sitetheme_releaseUrl', $this->themeArray[$name]['releaseUrl']);
$sql->db_Delete("menus", "menu_layout !='' ");
if($contentCheck === true)
{
$sql->db_Delete("menus", "menu_layout !='' ");
}
e107::getCache()->clear_sys(); e107::getCache()->clear_sys();

5
e107_plugins/linkwords/e_tohtml.php
View File

@ -144,6 +144,11 @@ class e_tohtml_linkwords
function to_html($text,$area = 'olddefault') function to_html($text,$area = 'olddefault')
{ {
if(is_string($this->area_opts))
{
$this->area_opts = e107::unserialize($this->area_opts);
}
if (!$this->lw_enabled || !count($this->area_opts) || !array_key_exists($area,$this->area_opts) || !$this->area_opts[$area]) return $text; // No linkwords in disabled areas if (!$this->lw_enabled || !count($this->area_opts) || !array_key_exists($area,$this->area_opts) || !$this->area_opts[$area]) return $text; // No linkwords in disabled areas
// Split up by HTML tags and process the odd bits here // Split up by HTML tags and process the odd bits here