mirror of
https://github.com/e107inc/e107.git
synced 2025-07-11 10:06:21 +02:00
Notice and Warning removals
This commit is contained in:
@ -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))
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
@ -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);
|
||||||
|
@ -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();
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
Reference in New Issue
Block a user