aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-02-17 15:50:41 +0000
committerplegall <plg@piwigo.org>2010-02-17 15:50:41 +0000
commit93559269f564effbd6e33f3cbe1b55c0fb25a5ac (patch)
tree3fe83bdff70a52c357c91c52007f9e1fbe1d9778
parentbf81ad9332925984109d2cb7ee543f8bd909e16a (diff)
bug 1443 fixed: ability to uninstall a missing plugin. I had forgotten the
pwg_token for this specific action on this specific state in r4506 for bug:1328 git-svn-id: http://piwigo.org/svn/branches/2.0@4901 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/plugins_list.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/admin/plugins_list.php b/admin/plugins_list.php
index 708ecd889..2f0eab1b2 100644
--- a/admin/plugins_list.php
+++ b/admin/plugins_list.php
@@ -32,6 +32,7 @@ $template->set_filenames(array('plugins' => 'plugins_list.tpl'));
$order = isset($_GET['order']) ? $_GET['order'] : 'name';
$base_url = get_root_url().'admin.php?page='.$page['page'].'&amp;order='.$order;
+$action_url = $base_url.'&amp;plugin='.'%s'.'&amp;pwg_token='.get_pwg_token();
$plugins = new plugins();
@@ -98,7 +99,7 @@ foreach($plugins->fs_plugins as $plugin_id => $fs_plugin)
array('NAME' => $display_name,
'VERSION' => $fs_plugin['version'],
'DESCRIPTION' => $desc,
- 'U_ACTION' => $base_url.'&amp;plugin='.$plugin_id.'&amp;pwg_token='.get_pwg_token());
+ 'U_ACTION' => sprintf($action_url, $plugin_id));
if (isset($plugins->db_plugins_by_id[$plugin_id]))
{
@@ -117,14 +118,12 @@ $missing_plugin_ids = array_diff(
foreach($missing_plugin_ids as $plugin_id)
{
- $action_url = $base_url.'&amp;plugin='.$plugin_id;
-
$template->append( 'plugins',
array(
'NAME' => $plugin_id,
'VERSION' => $plugins->db_plugins_by_id[$plugin_id]['version'],
'DESCRIPTION' => "ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW !",
- 'U_ACTION' => $base_url.'&amp;plugin='.$plugin_id,
+ 'U_ACTION' => sprintf($action_url, $plugin_id),
'STATE' => 'missing'
)
);