From 54c81c57636a2c20fec35c2e6e9664083956251d Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Tue, 12 Oct 2004 15:06:02 +0000
Subject: [PATCH] fixes for older php, removed warnings

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4027 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/WikiPluginCached.php | 6 +++++-
 lib/imagecache.php       | 9 +++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/WikiPluginCached.php b/lib/WikiPluginCached.php
index e11a6c9f3..6988c7cfd 100644
--- a/lib/WikiPluginCached.php
+++ b/lib/WikiPluginCached.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: WikiPluginCached.php,v 1.16 2004-10-12 14:56:57 rurban Exp $');
+<?php rcs_id('$Id: WikiPluginCached.php,v 1.17 2004-10-12 15:06:02 rurban Exp $');
 /*
  Copyright (C) 2002 Johannes Große (Johannes Gro&szlig;e)
  Copyright (C) 2004 Reini Urban
@@ -145,6 +145,7 @@ class WikiPluginCached extends WikiPlugin
             ksort($sortedargs);
         $this->_args =& $sortedargs;
         $this->_type = $this->getPluginType();
+        $this->_static = false;
         if ($this->_type & PLUGIN_CACHED_STATIC 
             or $request->getArg('action') == 'pdf') // htmldoc doesn't grok subrequests
         {    
@@ -1089,6 +1090,9 @@ class WikiPluginCached extends WikiPlugin
 
 
 // $Log: not supported by cvs2svn $
+// Revision 1.16  2004/10/12 14:56:57  rurban
+// lib/WikiPluginCached.php:731: Notice[8]: Undefined property: _static
+//
 // Revision 1.15  2004/09/26 17:09:23  rurban
 // add SVG support for Ploticus (and hopefully all WikiPluginCached types)
 // SWF not yet.
diff --git a/lib/imagecache.php b/lib/imagecache.php
index c5123f934..225eab853 100644
--- a/lib/imagecache.php
+++ b/lib/imagecache.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: imagecache.php,v 1.10 2004-09-22 13:46:26 rurban Exp $');
+<?php rcs_id('$Id: imagecache.php,v 1.11 2004-10-12 15:06:01 rurban Exp $');
 /*
  Copyright (C) 2002 Johannes Große (Johannes Gro&szlig;e)
 
@@ -115,6 +115,7 @@ function mainImageCache() {
     $id = $request->getArg('id');
     $args = $request->getArg('args');
     $request->setArg('action', 'imagecache');
+    $cache = new WikiPluginCached;
 
     if ($id) {
         // this indicates a direct call (script wasn't called as
@@ -131,7 +132,7 @@ function mainImageCache() {
             $uri = $request->get('REQUEST_URI');
         }
         if (!$uri) {
-            WikiPluginCached::printError( 'png', 
+            $cache->printError( 'png', 
                 'Could not deduce image identifier or creation'
                 . ' parameters. (Neither REQUEST nor REDIRECT'
                 . ' obtained.)' ); 
@@ -139,7 +140,7 @@ function mainImageCache() {
         }    
         //$cacheparams = $GLOBALS['CacheParams'];
         if (!preg_match(':^(.*/)?'.PLUGIN_CACHED_FILENAME_PREFIX.'([^\?/]+)\.img(\?args=([^\?&]*))?$:', $uri, $matches)) {
-            WikiPluginCached::printError('png', "I do not understand this URL: $uri");
+            $cache->printError('png', "I do not understand this URL: $uri");
             return;
         }        
         
@@ -151,7 +152,7 @@ function mainImageCache() {
         $request->setStatus(200); // No, we do _not_ have an Error 404 :->
     }
 
-    WikiPluginCached::fetchImageFromCache($request->_dbi, $request, 'png');
+    $cache->fetchImageFromCache($request->_dbi, $request, 'png');
 }
 
 
-- 
2.45.0