From 6411a4f462fcd039ce4d233aaf28a5186b20eeea Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Fri, 12 Feb 2016 23:26:39 +0000
Subject: [PATCH] [mod_pogoda] Podbicie wersji API yr.no

---
 class/std.php |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/class/std.php b/class/std.php
index c173cd5..884d2df 100644
--- a/class/std.php
+++ b/class/std.php
@@ -16,8 +16,7 @@
 	if(is_file(BOT_TOPDIR.'/class/legacy/'.$class.'.php')) {
 		require_once(BOT_TOPDIR.'/class/legacy/'.$class.'.php');
 	}
-	else
-	{
+	elseif(is_file(BOT_TOPDIR.'/class/'.$class.'.php')) {
 		require_once(BOT_TOPDIR.'/class/'.$class.'.php');
 	}
 }
@@ -30,11 +29,13 @@
 	throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
 }
 
-error_reporting(E_COMPILE_ERROR|E_PARSE);
+if(!defined('PHPUNIT')) {
+	error_reporting(E_COMPILE_ERROR|E_PARSE);
+	set_error_handler('errorToException', E_ALL & ~E_NOTICE);
+}
 
 setlocale(LC_CTYPE, 'pl_PL.utf8', 'pl_PL', 'polish', 'plk');
 mb_internal_encoding('UTF-8');
 libxml_use_internal_errors();
+libxml_disable_entity_loader(true);
 spl_autoload_register('botAutoload');
-set_error_handler('errorToException', E_ALL & ~E_NOTICE);
-?>
\ No newline at end of file

--
Gitblit v1.9.1