[Phpgroupware-cvs] phpgwapi/inc class.xslttemplates.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Dave Hall <address@hidden>      06/02/25 00:15:37

Modified files:
        inc            : class.xslttemplates.inc.php 

Log message:
        can't load both modules in the same version of php, so alter the test

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.xslttemplates.inc.php.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: phpgwapi/inc/class.xslttemplates.inc.php
diff -u phpgwapi/inc/class.xslttemplates.inc.php:1.21 
phpgwapi/inc/class.xslttemplates.inc.php:1.22
--- phpgwapi/inc/class.xslttemplates.inc.php:1.21       Wed Feb 22 09:41:28 2006
+++ phpgwapi/inc/class.xslttemplates.inc.php    Sat Feb 25 00:15:36 2006
@@ -8,16 +8,14 @@
        * @license http://www.gnu.org/licenses/lpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: class.xslttemplates.inc.php,v 1.21 2006/02/22 09:41:28 
skwashd Exp $
+       * @version $Id: class.xslttemplates.inc.php,v 1.22 2006/02/25 00:15:36 
skwashd Exp $
        */
 
-       if(!extension_loaded('xslt') && !extension_loaded('xsl'))
+       if( (floor(phpversion()) == 4 && !extension_loaded('xslt') )
+               || (floor(phpversion()) >= 5 && !extension_loaded('xsl') ) )
        {
-
-               echo 'PHP CONFIGURATION. xslt-extension is not loaded. Please 
contact the system administrator.';
-                       exit();
-               }
-       
+               die('PHP CONFIGURATION. xslt-extension is not loaded. Please 
contact the system administrator.');
+       }
        
        /**
        * Include xml tool