From 195218cbaf54dcf04af65d3cbae1ae915ff5f7d1 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 31 Mar 2010 17:23:19 -0700
Subject: [PATCH] when purging from system trash, return to system trash. 
 Fixes bug #11509.

---
 docs/changelog/7.x.x.txt | 1 +
 lib/WebGUI/AssetTrash.pm | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 19ca2874f..9ddbd2498 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -9,6 +9,7 @@
  - fixed #11503: Gallery: Wrong owner after uploading of ZIP archives
  - fixed #11494: Error message on mysql down
  - fixed: Viewing a Gallery File with non-ASCII keywords crashes
+ - fixed #11509: System trash not sticky
 
 7.9.1
  - fixed #11464: blank page after setting posts per page in Collaboration System to 0 (zero)
diff --git a/lib/WebGUI/AssetTrash.pm b/lib/WebGUI/AssetTrash.pm
index 8b2dd1165..f1aa87967 100644
--- a/lib/WebGUI/AssetTrash.pm
+++ b/lib/WebGUI/AssetTrash.pm
@@ -396,7 +396,8 @@ sub www_manageTrash {
     my $header;
     my $limit = 1;
     my $canAdmin = $self->session->user->isInGroup($self->session->setting->get('groupIdAdminTrash'));
-    if ($self->session->form->process("systemTrash") && $canAdmin) {
+    my $systemTrash = $self->session->form->process("systemTrash");
+    if ($systemTrash && $canAdmin) {
 		$header = $i18n->get(965);
 		$ac->addSubmenuItem($self->getUrl('func=manageTrash'), $i18n->get(10,"WebGUI"));
         $limit = undef;
@@ -436,6 +437,7 @@ sub www_manageTrash {
             assetManager.AddButton("'.$i18n->get("restore").'","restoreList","manageTrash");
             assetManager.AddButton("'.$i18n->get("purge").'","purgeList","manageTrash");
             assetManager.AddFormHidden({ name:"webguiCsrfToken", value:"'.$self->session->scratch->get('webguiCsrfToken').'"});
+            assetManager.AddFormHidden({ name:"systemTrash", value:"'.$systemTrash.'"});
             assetManager.Write();        
             var assetListSelectAllToggle = false;
             function toggleAssetListSelectAll(form) {
@@ -485,6 +487,9 @@ sub www_purgeList {
         }
     }
     my $method = ($session->form->process("proceed")) ? $session->form->process('proceed') : 'manageTrash';
+    if ($session->form->process('systemTrash') ) {
+        $method .= ';systemTrash=1';
+    }
     $pb->finish($self->getUrl('func='.$method));
 }