From 587c933112187483fac09fae61a95eae1db84b98 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sun, 03 Nov 2013 17:36:46 +0000
Subject: [PATCH] 1. Zmiana nazw kanałów AXN (Crime/Sci-Fi -> Black/White) 2. Usunięcie kanału RSS Linux News 3. Inne drobne zmiany (wspierane PHP >= 5.3)
---
class/std.php | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/class/std.php b/class/std.php
index 2f98c9f..dda6a51 100644
--- a/class/std.php
+++ b/class/std.php
@@ -13,28 +13,29 @@
$class = substr($class, 0, -9);
}
- if(!defined('BOT_TOPDIR')) {
- define('BOT_TOPDIR', dirname(__FILE__).'/../');
- }
-
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');
}
+}
+
+if(!defined('BOT_TOPDIR')) {
+ define('BOT_TOPDIR', dirname(__FILE__).'/../');
}
function errorToException($errno, $errstr, $errfile, $errline) {
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();
spl_autoload_register('botAutoload');
-set_error_handler('errorToException', E_ALL & ~E_NOTICE);
?>
\ No newline at end of file
--
Gitblit v1.9.1