diff options
| author | Florian Pritz <bluewind@xinu.at> | 2014-06-06 23:08:59 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2014-06-06 23:08:59 +0200 |
| commit | 77f15dc6ba5d3308d42e8f75103c3193d3796dd2 (patch) | |
| tree | 7e1a86f8b0ff954780a28bdea6c956649cf36d57 /system/libraries/javascript | |
| parent | 110b467503f7a749aec685be445468c0f98b9e2a (diff) | |
| parent | 916b176594bcf175417423f33711ac0cbb4082e7 (diff) | |
Merge remote-tracking branch 'remotes/upstream/2.2-stable' into working
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Conflicts:
system/libraries/Session.php
user_guide/
Diffstat (limited to 'system/libraries/javascript')
| -rw-r--r-- | system/libraries/javascript/Jquery.php | 14 | ||||
| -rw-r--r-- | system/libraries/javascript/index.html | 10 |
2 files changed, 17 insertions, 7 deletions
diff --git a/system/libraries/javascript/Jquery.php b/system/libraries/javascript/Jquery.php index baab83d25..48d8b3e57 100644 --- a/system/libraries/javascript/Jquery.php +++ b/system/libraries/javascript/Jquery.php @@ -3,7 +3,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 4.3.2 or newer + * An open source application development framework for PHP 5.1.6 or newer * * @package CodeIgniter * @author ExpressionEngine Dev Team @@ -23,7 +23,7 @@ * @category Loader * @link http://www.codeigniter.com/user_guide/libraries/javascript.html */ - + class CI_Jquery extends CI_Javascript { var $_javascript_folder = 'js'; @@ -36,18 +36,18 @@ class CI_Jquery extends CI_Javascript { public function __construct($params) { - $this->CI =& get_instance(); + $this->CI =& get_instance(); extract($params); if ($autoload === TRUE) { - $this->script(); + $this->script(); } - + log_message('debug', "Jquery Class Initialized"); } - - // -------------------------------------------------------------------- + + // -------------------------------------------------------------------- // Event Code // -------------------------------------------------------------------- diff --git a/system/libraries/javascript/index.html b/system/libraries/javascript/index.html new file mode 100644 index 000000000..c942a79ce --- /dev/null +++ b/system/libraries/javascript/index.html @@ -0,0 +1,10 @@ +<html> +<head> + <title>403 Forbidden</title> +</head> +<body> + +<p>Directory access is forbidden.</p> + +</body> +</html>
\ No newline at end of file |