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

Issue #1336 - Allow forum update to continue if empty tables found.

Browse Source
This commit is contained in:
Cameron
2016-02-09 17:41:18 -08:00
parent fee3764dff
commit e7f5155703
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_plugins/forum/forum_update.php
View File

@@ -190,11 +190,18 @@ function step2()
$ret = ''; $ret = '';
$failed = false; $failed = false;
$text = ''; $text = '';
$sql = e107::getDb();
foreach ($tabList as $name => $rename) foreach ($tabList as $name => $rename)
{ {
$message = 'Creating table ' . ($rename ? $rename : $name); $message = 'Creating table ' . ($rename ? $rename : $name);
$result = $db -> createTable(e_PLUGIN . 'forum/forum_sql.php', $name, true, $rename); if($sql->isTable($name) && $sql->isEmpty($name))
{
$mes -> addSuccess("Skipping table ".$name." (already exists)");
continue;
}
$result = $db->createTable(e_PLUGIN . 'forum/forum_sql.php', $name, true, $rename);
if ($result === true) if ($result === true)
{ {
$mes -> addSuccess($message); $mes -> addSuccess($message);
@@ -221,9 +228,9 @@ function step2()
$ns -> tablerender('Step 2: Forum table creation', $mes -> render() . $text); $ns -> tablerender('Step 2: Forum table creation', $mes -> render() . $text);
} }
// FIXME - use e107::getPlugin()->manage_extended_field('add', $name, $attrib,
// $source)
// FIXME - use e107::getPlugin()->manage_extended_field('add', $name, $attrib, $source)
function step3() function step3()
{ {
$ns = e107::getRender(); $ns = e107::getRender();