[Bps-public-commit] r14949 - in Prophet/trunk: .

[sartak at bestpractical.com]

Author: sartak
Date: Sat Aug  9 13:29:17 2008
New Revision: 14949

Modified:
   Prophet/trunk/   (props changed)
   Prophet/trunk/lib/Prophet/Server.pm

Log:
 r69013 at onn:  sartak | 2008-08-09 13:29:06 -0400
 use base happens at compile time, regardless of whether it's surrounded in an "if" :)


Modified: Prophet/trunk/lib/Prophet/Server.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Server.pm	(original)
+++ Prophet/trunk/lib/Prophet/Server.pm	Sat Aug  9 13:29:17 2008
@@ -1,14 +1,15 @@
 package Prophet::Server;
 use warnings;
 use strict;
+use Prophet::App;
 
-Prophet::App->try_to_require('HTTP::Server::Simple::Bonjour');
-if (Prophet::App->already_required('HTTP::Server::Simple::Bonjour')){
-   use base qw'HTTP::Server::Simple::Bonjour';
+BEGIN {
+    if (Prophet::App->try_to_require('HTTP::Server::Simple::Bonjour')) {
+        our @ISA = 'HTTP::Server::Simple::Bonjour';
+    }
 }
-use base qw'HTTP::Server::Simple::CGI';
-
 
+use base qw'HTTP::Server::Simple::CGI';
 
 use Prophet::Server::View;
 use Params::Validate qw/:all/;