mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-05-14 05:47:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

bug fixed: no need to check the table piwigo_plugins, this table always exists at this point

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@29735 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2014-09-22 12:55:01 +00:00
parent c92b76a3b6
commit 01c531746a
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
admin/include/functions_upgrade.php
View file

@ -77,7 +77,6 @@ function deactivate_non_standard_plugins()
$standard_plugins = array( $standard_plugins = array(
'AdminTools', 'AdminTools',
'TakeATour', 'TakeATour',
'event_tracer',
'language_switch', 'language_switch',
'LocalFilesEditor' 'LocalFilesEditor'
); );

2
admin/include/updates.class.php
View file

@ -44,7 +44,7 @@ class updates
{ {
$this->types = array($page); $this->types = array($page);
} }
$this->default_themes = array('clear', 'dark', 'Sylvia', 'elegant'); $this->default_themes = array('clear', 'dark', 'Sylvia', 'elegant', 'smartpocket');
$this->default_plugins = array('AdminTools', 'TakeATour', 'language_switch', 'LocalFilesEditor'); $this->default_plugins = array('AdminTools', 'TakeATour', 'language_switch', 'LocalFilesEditor');
foreach ($this->types as $type) foreach ($this->types as $type)

10
upgrade.php
View file

@ -279,6 +279,8 @@ if ($has_remote_site)
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+
$tables = get_tables(); $tables = get_tables();
// echo '<pre>'; print_r($tables); echo '</pre>';
// echo 'PREFIX_TABLE='.PREFIX_TABLE.'<br>';
$columns_of = get_columns_of($tables); $columns_of = get_columns_of($tables);
// find the current release // find the current release
@ -409,12 +411,8 @@ if ((isset($_POST['submit']) or isset($_GET['now']))
} }
} }
// Plugins deactivation // Deactivate non standard extensions
if (in_array(PREFIX_TABLE.'plugins', $tables)) deactivate_non_standard_plugins();
{
deactivate_non_standard_plugins();
}
deactivate_non_standard_themes(); deactivate_non_standard_themes();
deactivate_templates(); deactivate_templates();