mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-29 18:47:54 +01:00
Code Issues Releases Wiki Activity

Merge pull request #3297 from SimSync/dbupdate_featurebox

Browse Source 
Fixes the "dbupdate after a clean install" issue
This commit is contained in:
Cameron 2018-07-20 12:56:47 -07:00 committed by GitHub
commit 26fe2d4216
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
e107_handlers/plugin_class.php
View File

@ -1303,7 +1303,7 @@ class e107plugin
continue;
}
if(!isset($this->core_plugins[$path])) // check non-core plugins for sql file changes.
if(!is_array($path, $this->core_plugins)) // check non-core plugins for sql file changes.
{
$dbv->errors = array();
$dbv->compare($path);
@ -1315,40 +1315,35 @@ class e107plugin
}
}
// $curVal = floatval($version);
$curVal = $version;
$fileVal = $plg->getVersion(); // floatval($data['@attributes']['version']);
// $fileVal = floatval($fileVal);
$curVal = $version;
$fileVal = $plg->getVersion();
if($ret = $this->execute_function($path, 'upgrade', 'required', array($this, $curVal, $fileVal))) // Check {plugin}_setup.php and run a 'required' method, if true, then update is required.
if($ret = $this->execute_function($path, 'upgrade', 'required', array($this, $curVal, $fileVal))) // Check {plugin}_setup.php and run a 'required' method, if true, then update is required.
{
$mes->addDebug("Plugin Update(s) Required in ".$path."_setup.php [".$path."]");
if($mode === 'boolean')
{
$mes->addDebug("Plugin Update(s) Required in ".$path."_seup.php [".$path."]");
return TRUE;
}
if($mode === 'boolean')
{
$needed[$path] = $data;
}
return TRUE;
}
if(version_compare($curVal,$fileVal,"<")) // check pref version against file version.
{
$mes->addDebug("Plugin Update(s) Required - different version [".$path."]");
$needed[$path] = $data;
}
if(version_compare($curVal,$fileVal,"<")) // check pref version against file version.
if($mode === 'boolean')
{
$mes->addDebug("Plugin Update(s) Required - different version [".$path."]");
return TRUE;
}
if($mode === 'boolean')
{
return TRUE;
}
// $mes->addDebug("Plugin: <strong>{$path}</strong> requires an update.");
// $log->flushMessages();
$needed[$path] = $data;
}
// $mes->addDebug("Plugin: <strong>{$path}</strong> requires an update.");
// $log->flushMessages();
$needed[$path] = $data;
}
}
@ -1359,8 +1354,6 @@ class e107plugin
}
if($mode === 'boolean')
{
return count($needed) ? true : FALSE;