From d59f368c27eb4458194aebf3833a3b08b1bd720e Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sun, 15 Sep 2002 15:05:47 +0000
Subject: [PATCH] fix that <?plugin-head is only invoked when it is the very
 first text. (most likely ignoring the rest of the page, leaving that as a
 dustbin...)

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@2348 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/Template.php   | 10 ++--------
 lib/WikiPlugin.php | 20 +++++++++++++++++---
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/lib/Template.php b/lib/Template.php
index a4ced92ad..737314cec 100644
--- a/lib/Template.php
+++ b/lib/Template.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: Template.php,v 1.45 2002-09-02 14:36:58 rurban Exp $');
+<?php rcs_id('$Id: Template.php,v 1.46 2002-09-15 15:05:47 rurban Exp $');
 
 require_once("lib/ErrorManager.php");
 require_once("lib/WikiPlugin.php");
@@ -221,13 +221,7 @@ function GeneratePage($content, $title, $page_revision = false, $args = false) {
             substr($text,0,$len) == '<?plugin-head')
         {
             $loader = new WikiPluginLoader();
-            // CheckMe!
-            return $loader->expandPI($text,$request);
-            /* // the return of FrameInclude:
-               $plugin = TransformText($page_revision);
-               $args['FRAMESET'] = $plugin->_content[0];
-               printXML(new Template('frameset', $request, $args));
-            */
+            return $loader->expandPI_head($text,$request);
         } else {
             printXML(new Template('html', $request, $args));
         }
diff --git a/lib/WikiPlugin.php b/lib/WikiPlugin.php
index eb62b0015..305fd5b5a 100644
--- a/lib/WikiPlugin.php
+++ b/lib/WikiPlugin.php
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: WikiPlugin.php,v 1.25 2002-09-02 14:36:58 rurban Exp $');
+rcs_id('$Id: WikiPlugin.php,v 1.26 2002-09-15 15:05:47 rurban Exp $');
 
 class WikiPlugin
 {
@@ -240,7 +240,7 @@ class WikiPluginLoader {
     var $_errors;
 
     function expandPI($pi, $request) {
-        if (!preg_match('/^\s*<\?(plugin(?:-form|-link|-head)?)\s+(\w+)\s*(.*?)\s*\?>\s*$/s', $pi, $m))
+        if (!preg_match('/^\s*<\?(plugin(?:-form|-link)?)\s+(\w+)\s*(.*?)\s*\?>\s*$/s', $pi, $m))
             return $this->_error(sprintf("Bad %s", 'PI'));
 
         list(, $pi_name, $plugin_name, $plugin_args) = $m;
@@ -252,7 +252,6 @@ class WikiPluginLoader {
         }
         switch ($pi_name) {
             case 'plugin':
-            case 'plugin-head':
                 // FIXME: change API for run() (no $dbi needed).
                 $dbi = $request->getDbh();
                 return $plugin->run($dbi, $plugin_args, $request);
@@ -263,6 +262,21 @@ class WikiPluginLoader {
         }
     }
 
+    // Special treatment. Only called by Template.php:GeneratePage
+    function expandPI_head($pi, $request) {
+        if (!preg_match('/^\s*<\?plugin-head\s+(\w+)\s*(.*?)\s*\?>\s*$/s', $pi, $m))
+            return $this->_error(sprintf("Bad %s", 'PI'));
+
+        list(, $plugin_name, $plugin_args) = $m;
+        $plugin = $this->getPlugin($plugin_name);
+        if (!is_object($plugin)) {
+            return new HtmlElement('p', array('class' => 'plugin-error'),
+                                   $this->getErrorDetail());
+        }
+        $dbi = $request->getDbh();
+        return $plugin->run($dbi, $plugin_args, $request);
+    }
+
     function getPlugin($plugin_name) {
         global $ErrorManager;
 
-- 
2.45.0