Make sure traditional include-path-style class loading does not interfere with a working class autoloader
This commit is contained in:
parent
012389ee13
commit
3e8a35b81f
|
|
@ -31,8 +31,9 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
require_once 'PEAR.php';
|
||||
require_once 'Spreadsheet/Excel/Writer/Workbook.php';
|
||||
if (!class_exists('Spreadsheet_Excel_Writer_Workbook')) {
|
||||
require_once 'Spreadsheet/Excel/Writer/Workbook.php';
|
||||
}
|
||||
|
||||
/**
|
||||
* Class for writing Excel Spreadsheets. This class should change COMPLETELY.
|
||||
|
|
|
|||
|
|
@ -32,7 +32,9 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
require_once 'PEAR.php';
|
||||
if (!class_exists('PEAR')) {
|
||||
require_once 'PEAR.php';
|
||||
}
|
||||
|
||||
/**
|
||||
* Class for writing Excel BIFF records.
|
||||
|
|
|
|||
|
|
@ -32,7 +32,9 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
require_once 'PEAR.php';
|
||||
if (!class_exists('PEAR')) {
|
||||
require_once 'PEAR.php';
|
||||
}
|
||||
|
||||
/**
|
||||
* Class for generating Excel XF records (formats)
|
||||
|
|
|
|||
|
|
@ -97,7 +97,9 @@ define('SPREADSHEET_EXCEL_WRITER_NE', "<>");
|
|||
*/
|
||||
define('SPREADSHEET_EXCEL_WRITER_CONCAT', "&");
|
||||
|
||||
require_once 'PEAR.php';
|
||||
if (!class_exists('PEAR')) {
|
||||
require_once 'PEAR.php';
|
||||
}
|
||||
|
||||
/**
|
||||
* Class for parsing Excel formulas
|
||||
|
|
|
|||
|
|
@ -32,12 +32,20 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
require_once 'Spreadsheet/Excel/Writer/Format.php';
|
||||
require_once 'Spreadsheet/Excel/Writer/BIFFwriter.php';
|
||||
require_once 'Spreadsheet/Excel/Writer/Worksheet.php';
|
||||
require_once 'Spreadsheet/Excel/Writer/Parser.php';
|
||||
require_once 'OLE/PPS/Root.php';
|
||||
require_once 'OLE/PPS/File.php';
|
||||
if (!class_exists('Spreadsheet_Excel_Writer_BIFFwriter')) {
|
||||
require_once 'Spreadsheet/Excel/Writer/Format.php';
|
||||
require_once 'Spreadsheet/Excel/Writer/BIFFwriter.php';
|
||||
require_once 'Spreadsheet/Excel/Writer/Worksheet.php';
|
||||
require_once 'Spreadsheet/Excel/Writer/Parser.php';
|
||||
}
|
||||
|
||||
if (!class_exists('OLE_PPS_Root')) {
|
||||
require_once 'OLE/PPS/Root.php';
|
||||
}
|
||||
|
||||
if (!class_exists('OLE_PPS_File')) {
|
||||
require_once 'OLE/PPS/File.php';
|
||||
}
|
||||
|
||||
/**
|
||||
* Class for generating Excel Spreadsheets
|
||||
|
|
@ -378,7 +386,9 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
|
|||
*/
|
||||
public function &addValidator()
|
||||
{
|
||||
include_once 'Spreadsheet/Excel/Writer/Validator.php';
|
||||
if (!class_exists('Spreadsheet_Excel_Writer_Validator')) {
|
||||
include_once 'Spreadsheet/Excel/Writer/Validator.php';
|
||||
}
|
||||
/* FIXME: check for successful inclusion*/
|
||||
$valid = new Spreadsheet_Excel_Writer_Validator($this->_parser);
|
||||
return $valid;
|
||||
|
|
|
|||
|
|
@ -32,8 +32,10 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
require_once 'Spreadsheet/Excel/Writer/Parser.php';
|
||||
require_once 'Spreadsheet/Excel/Writer/BIFFwriter.php';
|
||||
if (!class_exists('Spreadsheet_Excel_Writer_BIFFwriter')) {
|
||||
require_once 'Spreadsheet/Excel/Writer/Parser.php';
|
||||
require_once 'Spreadsheet/Excel/Writer/BIFFwriter.php';
|
||||
}
|
||||
|
||||
/**
|
||||
* Class for generating Excel Spreadsheets
|
||||
|
|
|
|||
Loading…
Reference in New Issue