From 118a03eb6dfa73e5dc273f75178ba592fe4a0722 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 9 Sep 2010 10:57:39 -0600
Subject: [PATCH] Cleanup some Application file code.

---
 luxor/lib/Application.php  |  1 -
 passwd/lib/Application.php | 13 +------------
 pastie/lib/Application.php |  1 -
 vilma/lib/Application.php  |  9 +++++----
 wicked/lib/Application.php |  5 -----
 5 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/luxor/lib/Application.php b/luxor/lib/Application.php
index 3807bdf6d..ca165f36b 100644
--- a/luxor/lib/Application.php
+++ b/luxor/lib/Application.php
@@ -47,7 +47,6 @@ class Luxor_Application extends Horde_Registry_Application
     protected function _init()
     {
         // Luxor base libraries.
-        require_once LUXOR_BASE . '/lib/Luxor.php';
         Luxor::initialize();
     }
 
diff --git a/passwd/lib/Application.php b/passwd/lib/Application.php
index a7dd42061..2b4d90a92 100644
--- a/passwd/lib/Application.php
+++ b/passwd/lib/Application.php
@@ -33,15 +33,4 @@ if (!defined('HORDE_BASE')) {
  * Horde_Registry_Application::). */
 require_once HORDE_BASE . '/lib/core.php';
 
-class Passwd_Application extends Horde_Registry_Application
-{
-    /**
-     * Initialization function.
-     *
-     * Global variables defined:
-     */
-    protected function _init()
-    {
-
-    }
-}
\ No newline at end of file
+class Passwd_Application extends Horde_Registry_Application {}
diff --git a/pastie/lib/Application.php b/pastie/lib/Application.php
index 453544844..7cc9ba983 100644
--- a/pastie/lib/Application.php
+++ b/pastie/lib/Application.php
@@ -47,7 +47,6 @@ class Pastie_Application extends Horde_Registry_Application
             $this->driver = Pastie_Driver::factory();
         } catch (Pastie_Exception $e) {
             $GLOBALS['notification']->notify($e);
-            return false;
         }
     }
 
diff --git a/vilma/lib/Application.php b/vilma/lib/Application.php
index b89604299..71a33c815 100644
--- a/vilma/lib/Application.php
+++ b/vilma/lib/Application.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Shout application interface.
+ * Vilma application interface.
  *
- * This file defines Shout's external API interface.
+ * This file defines Vilma's external API interface.
  *
  * Copyright 2006-2010 Alkaloid Networks <http://www.alkaloid.net/>
  *
@@ -24,9 +24,10 @@ class Vilma_Application extends Horde_Registry_Application
 
     protected function _init()
     {
-        $this->driver = &Vilma_Driver::singleton();
+        $this->driver = Vilma_Driver::singleton();
 
-        // Get the currently active domain, possibly storing a change into the session
+        // Get the currently active domain, possibly storing a change into the
+        // session
         $this->curdomain = Vilma::getCurDomain();
     }
 
diff --git a/wicked/lib/Application.php b/wicked/lib/Application.php
index 83aba2bb3..2a005a57f 100644
--- a/wicked/lib/Application.php
+++ b/wicked/lib/Application.php
@@ -32,11 +32,6 @@ if (!defined('HORDE_BASE')) {
  * Horde_Registry_Application::). */
 require_once HORDE_BASE . '/lib/core.php';
 
-// Wicked base libraries.
-require_once WICKED_BASE . '/lib/Wicked.php';
-require_once WICKED_BASE . '/lib/Driver.php';
-require_once WICKED_BASE . '/lib/Page.php';
-
 class Wicked_Application extends Horde_Registry_Application
 {
     /**
-- 
2.11.0