archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug fixed: many errors reported if your database contains something else

Browse source 
than PhpWebGallery tables.


git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1319 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2006-05-23 21:15:34 +00:00
parent 58bce5eb42
commit 91642e8683
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
upgrade.php
View file

@ -81,10 +81,10 @@ SHOW TABLES
while ($row = mysql_fetch_row($result))
{
array_push(
$tables,
preg_replace('/^'.PREFIX_TABLE.'/', '', $row[0])
);
if (preg_match('/^'.PREFIX_TABLE.'/', $row[0]))
{
array_push($tables, $row[0]);
}
}
return $tables;
@ -102,7 +102,7 @@ function get_columns_of($tables)
foreach ($tables as $table)
{
$query = '
DESC '.PREFIX_TABLE.$table.'
DESC '.$table.'
;';
$result = mysql_query($query);
@ -161,10 +161,10 @@ if (!isset($_GET['version']))
$tables = get_tables();
$columns_of = get_columns_of($tables);
if (!in_array('param', $columns_of['config']))
if (!in_array('param', $columns_of[PREFIX_TABLE.'config']))
{
// we're in branch 1.3, important upgrade, isn't it?
if (in_array('user_category', $tables))
if (in_array(PREFIX_TABLE.'user_category', $tables))
{
$current_release = '1.3.1';
}
@ -173,11 +173,11 @@ if (!isset($_GET['version']))
$current_release = '1.3.0';
}
}
else if (!in_array('user_cache', $tables))
else if (!in_array(PREFIX_TABLE.'user_cache', $tables))
{
$current_release = '1.4.0';
}
else if (!in_array('tags', $tables))
else if (!in_array(PREFIX_TABLE.'tags', $tables))
{
$current_release = '1.5.0';
}
@ -302,4 +302,4 @@ UPDATE '.USER_CACHE_TABLE.'
// +-----------------------------------------------------------------------+
$template->pparse('upgrade');
?>
?>