[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [484] trunk/rdfapi-php/api/sparql/SparqlEngine

[<cw...@us...>]

Revision: 484
          http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=484&view=rev
Author:   cweiske
Date:     2007-08-12 04:33:13 -0700 (Sun, 12 Aug 2007)

Log Message:
-----------
Fix bug 1750658: ResultConverter loadClass does not work with __autoload

Modified Paths:
--------------
    trunk/rdfapi-php/api/sparql/SparqlEngine/ResultConverter.php
    trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultConverter.php

Modified: trunk/rdfapi-php/api/sparql/SparqlEngine/ResultConverter.php
===================================================================
--- trunk/rdfapi-php/api/sparql/SparqlEngine/ResultConverter.php	2007-08-12 11:24:06 UTC (rev 483)
+++ trunk/rdfapi-php/api/sparql/SparqlEngine/ResultConverter.php	2007-08-12 11:33:13 UTC (rev 484)
@@ -84,27 +84,27 @@
     */
     protected static function loadClass($strClass)
     {
-        if (class_exists($strClass)) {
+        if (class_exists($strClass, false)) {
             return $strClass;
         }
 
         //RAP style, shortcut notation
         $strFile = 'SparqlEngine/ResultRenderer/' . $strClass . '.php';
         @include_once RDFAPI_INCLUDE_DIR . 'sparql/' . $strFile;
-        if (class_exists('SparqlEngine_ResultRenderer_' . $strClass)) {
+        if (class_exists('SparqlEngine_ResultRenderer_' . $strClass, false)) {
             return 'SparqlEngine_ResultRenderer_' . $strClass;
         }
 
         //RAP style
         $strFile = str_replace('_', '/', $strClass) . '.php';
         @include_once RDFAPI_INCLUDE_DIR . 'sparql/' . $strFile;
-        if (class_exists($strClass)) {
+        if (class_exists($strClass, false)) {
             return $strClass;
         }
 
         //PEAR style
         @include_once $strFile;
-        if (class_exists($strClass)) {
+        if (class_exists($strClass, false)) {
             return $strClass;
         }
 

Modified: trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultConverter.php
===================================================================
--- trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultConverter.php	2007-08-12 11:24:06 UTC (rev 483)
+++ trunk/rdfapi-php/api/sparql/SparqlEngineDb/ResultConverter.php	2007-08-12 11:33:13 UTC (rev 484)
@@ -84,7 +84,7 @@
     */
     protected static function loadClass($strClass)
     {
-        if (class_exists($strClass)) {
+        if (class_exists($strClass, false)) {
             return $strClass;
         }
 
@@ -98,13 +98,13 @@
         //RAP style
         $strFile = str_replace('_', '/', $strClass) . '.php';
         @include_once RDFAPI_INCLUDE_DIR . 'sparql/' . $strFile;
-        if (class_exists($strClass)) {
+        if (class_exists($strClass, false)) {
             return $strClass;
         }
 
         //PEAR style
         @include_once $strFile;
-        if (class_exists($strClass)) {
+        if (class_exists($strClass, false)) {
             return $strClass;
         }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.