From bb4702343f241544b73d0fdc2b8873648e061036 Mon Sep 17 00:00:00 2001
From: Ben Klang <ben@alkaloid.net>
Date: Mon, 8 Mar 2010 17:44:48 -0500
Subject: [PATCH] Shout: Fix listing extensions

---
 shout/extensions.php           | 8 ++++----
 shout/lib/Ajax/Application.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/shout/extensions.php b/shout/extensions.php
index a7e1b0322..df3468edb 100644
--- a/shout/extensions.php
+++ b/shout/extensions.php
@@ -48,7 +48,7 @@ case 'edit':
 
     // Create a new add/edit form
     $extension = Horde_Util::getFormData('extension');
-    $extensions = $shout->extensions->getExtensions($curaccount['code']);
+    $extensions = $shout->extensions->getExtensions($curaccount);
     $vars = new Horde_Variables($extensions[$extension]);
     if ($action == 'edit') {
         $vars->set('oldextension', $extension);
@@ -65,7 +65,7 @@ case 'delete':
     $extension = Horde_Util::getFormData('extension');
 
     $vars = Horde_Variables::getDefaultVariables();
-    $vars->set('account', $curaccount['code']);
+    $vars->set('account', $curaccount);
     $Form = new ExtensionDeleteForm($vars);
 
     $FormValid = $Form->validate($vars, true);
@@ -84,7 +84,7 @@ case 'delete':
     }
 
     $vars = Horde_Variables::getDefaultVariables(array());
-    $vars->set('account', $curaccount['code']);
+    $vars->set('account', $curaccount);
     $Form = new ExtensionDeleteForm($vars);
 
     break;
@@ -98,7 +98,7 @@ default:
 
 // Fetch the (possibly updated) list of extensions
 try {
-    $extensions = $shout->extensions->getExtensions($curaccount['code']);
+    $extensions = $shout->extensions->getExtensions($curaccount);
 } catch (Exception $e) {
     $notification->push($e);
     $extensions = array();
diff --git a/shout/lib/Ajax/Application.php b/shout/lib/Ajax/Application.php
index 2f5f94dbf..fee3d148f 100644
--- a/shout/lib/Ajax/Application.php
+++ b/shout/lib/Ajax/Application.php
@@ -75,7 +75,7 @@ class Shout_Ajax_Application extends Horde_Ajax_Application_Base
     {
         $vars = $this->_vars;
         $shout = Horde_Registry::appInit('shout');
-        $account = $_SESSION['shout']['account'];
+        $account = $_SESSION['shout']['curaccount'];
         try {
             return $shout->extensions->getExtensions($account);
         } catch (Exception $e) {
-- 
2.11.0