Require outside of the library

diff --git a/lib/pukiwiki.php b/lib/pukiwiki.php
index 7e9c110..0f228c0 100644 (file)
--- a/lib/pukiwiki.php
+++ b/lib/pukiwiki.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: pukiwiki.php,v 1.19 2007/04/15 12:31:02 henoheno Exp $
+// $Id: pukiwiki.php,v 1.20 2007/07/03 14:53:35 henoheno Exp $
 //
 // PukiWiki 1.4.*
 //  Copyright (C) 2002-2007 by PukiWiki Developers Team
@@ -98,6 +98,7 @@ if ($spam && $method != 'GET') {
        }
        if ($_spam) {
                require(LIB_DIR . 'spam.php');
+               require(LIB_DIR . 'spam_pickup.php');
                if (isset($spam['method'][$_plugin])) {
                        $_method = & $spam['method'][$_plugin];
                } else if (isset($spam['method']['_default'])) {

diff --git a/lib/spam.php b/lib/spam.php
index 1fbb2f4..09420f8 100644 (file)
--- a/lib/spam.php
+++ b/lib/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.29 2007/07/03 14:47:20 henoheno Exp $
+// $Id: spam.php,v 1.30 2007/07/03 14:53:35 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -7,8 +7,6 @@
 //
 // (PHP 4 >= 4.3.0): preg_match_all(PREG_OFFSET_CAPTURE): $method['uri_XXX'] related feature
 
-require_once('spam_pickup.php');
-
 if (! defined('SPAM_INI_FILE'))   define('SPAM_INI_FILE',   'spam.ini.php');
 if (! defined('DOMAIN_INI_FILE')) define('DOMAIN_INI_FILE', 'domain.ini.php');