summaryrefslogtreecommitdiffstats
path: root/application/libraries
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2017-09-26 13:46:14 +0200
committerFlorian Pritz <bluewind@xinu.at>2017-09-26 13:46:14 +0200
commit3ff6ffa3341c876b741feb66552cdd110b67872e (patch)
tree69e11cd0009ddd1346f2dc4cd8c47244368db28e /application/libraries
parentbc2f7f596f727e204e8b8c5b849545745b3cbfaa (diff)
parent81a4c8c630ef59cffea0c24e64fb6fa7f09bfcf6 (diff)
Merge CodeIgniter 3 support
Diffstat (limited to 'application/libraries')
-rw-r--r--application/libraries/Customautoloader.php2
-rw-r--r--application/libraries/Ddownload/Ddownload.php2
-rw-r--r--application/libraries/Duser/Duser.php2
-rw-r--r--application/libraries/ExceptionHandler.php2
-rw-r--r--application/libraries/index.html3
5 files changed, 6 insertions, 5 deletions
diff --git a/application/libraries/Customautoloader.php b/application/libraries/Customautoloader.php
index 426364ee3..eb14c5624 100644
--- a/application/libraries/Customautoloader.php
+++ b/application/libraries/Customautoloader.php
@@ -8,7 +8,7 @@
*/
// Original source: http://stackoverflow.com/a/9526005/953022
-class CustomAutoloader{
+class Customautoloader {
public function __construct()
{
spl_autoload_register(array($this, 'loader'));
diff --git a/application/libraries/Ddownload/Ddownload.php b/application/libraries/Ddownload/Ddownload.php
index 808dfe776..3a98d4154 100644
--- a/application/libraries/Ddownload/Ddownload.php
+++ b/application/libraries/Ddownload/Ddownload.php
@@ -17,7 +17,7 @@ class Ddownload extends CI_Driver_Library {
protected $_adapter = null;
protected $valid_drivers = array(
- 'ddownload_php', 'ddownload_nginx', 'ddownload_lighttpd'
+ 'php', 'nginx', 'lighttpd'
);
function __construct()
diff --git a/application/libraries/Duser/Duser.php b/application/libraries/Duser/Duser.php
index 8005a00bb..0007fabd8 100644
--- a/application/libraries/Duser/Duser.php
+++ b/application/libraries/Duser/Duser.php
@@ -50,7 +50,7 @@ class Duser extends CI_Driver_Library {
protected $_adapter = null;
protected $valid_drivers = array(
- 'duser_db', 'duser_ldap', 'duser_fluxbb'
+ 'db', 'ldap', 'fluxbb'
);
function __construct()
diff --git a/application/libraries/ExceptionHandler.php b/application/libraries/ExceptionHandler.php
index acfa97163..94a1d35c0 100644
--- a/application/libraries/ExceptionHandler.php
+++ b/application/libraries/ExceptionHandler.php
@@ -130,7 +130,7 @@ class ExceptionHandler {
}
$message = "$message";
- include APPPATH."/errors/error_general.php";
+ include VIEWPATH."/errors/html/error_general.php";
}
/**
diff --git a/application/libraries/index.html b/application/libraries/index.html
index c942a79ce..b702fbc39 100644
--- a/application/libraries/index.html
+++ b/application/libraries/index.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<html>
<head>
<title>403 Forbidden</title>
@@ -7,4 +8,4 @@
<p>Directory access is forbidden.</p>
</body>
-</html> \ No newline at end of file
+</html>