Changeset 12378


Ignore:
Timestamp:
10/07/11 15:04:01 (8 years ago)
Author:
patdenice
Message:

merge r12359-12360 from trunk to branch 2.3
Avoid error if several obsolet plugins have to be uninstalled.
It's better to only deactivate obsolete plugins on loading.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.3/admin/plugins_installed.php

    r12033 r12378  
    139139  if (isset($fs_plugin['extension']) and isset($merged_extensions[$fs_plugin['extension']])) 
    140140  { 
    141     $plugins->perform_action('uninstall', $plugin_id); 
     141    // Deactivate manually plugin from database 
     142    $query = 'UPDATE '.PLUGINS_TABLE.' SET state=\'inactive\' WHERE id=\''.$plugin_id.'\''; 
     143    pwg_query($query); 
     144 
    142145    $tpl_plugin['STATE'] = 'merged'; 
    143146    $tpl_plugin['DESC'] = l10n('THIS PLUGIN IS NOW PART OF PIWIGO CORE! DELETE IT NOW.'); 
Note: See TracChangeset for help on using the changeset viewer.