diff options
| -rw-r--r-- | application/config/mimes.php | 1 | ||||
| -rw-r--r-- | tests/README.md | 2 | ||||
| -rw-r--r-- | tests/codeigniter/core/Security_test.php | 2 | ||||
| -rw-r--r-- | tests/codeigniter/core/URI_test.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/general/models.rst | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index bab431f77..e2079b90e 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -170,6 +170,7 @@ return array( 'kmz' => array('application/vnd.google-earth.kmz', 'application/zip', 'application/x-zip'), 'kml' => array('application/vnd.google-earth.kml+xml', 'application/xml', 'text/xml'), 'ics' => 'text/calendar', + 'ical' => 'text/calendar', 'zsh' => 'text/x-scriptzsh', '7zip' => array('application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'), 'cdr' => array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'), diff --git a/tests/README.md b/tests/README.md index 3e32edc0c..47b5241d1 100644 --- a/tests/README.md +++ b/tests/README.md @@ -1,6 +1,6 @@ # CodeIgniter Unit Tests # -Status : [](http://travis-ci.org/EllisLab/CodeIgniter) +Status : [](http://travis-ci.org/bcit-ci/CodeIgniter) ### Introduction: diff --git a/tests/codeigniter/core/Security_test.php b/tests/codeigniter/core/Security_test.php index c80c3d65a..402422ff8 100644 --- a/tests/codeigniter/core/Security_test.php +++ b/tests/codeigniter/core/Security_test.php @@ -98,7 +98,7 @@ class Security_test extends CI_TestCase { $this->assertEquals('<div>Hello <b>Booya</b></div>', $decoded); - // Issue #3057 (https://github.com/EllisLab/CodeIgniter/issues/3057) + // Issue #3057 (https://github.com/bcit-ci/CodeIgniter/issues/3057) $this->assertEquals( '&foo should not include a semicolon', $this->security->entity_decode('&foo should not include a semicolon') diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php index 6589c1f5a..b05a385d6 100644 --- a/tests/codeigniter/core/URI_test.php +++ b/tests/codeigniter/core/URI_test.php @@ -11,7 +11,7 @@ class URI_test extends CI_TestCase { /* As of the following commit, _set_uri_string() is a protected method: - https://github.com/EllisLab/CodeIgniter/commit/d461934184d95b0cfb2feec93f27b621ef72a5c2 + https://github.com/bcit-ci/CodeIgniter/commit/d461934184d95b0cfb2feec93f27b621ef72a5c2 public function test_set_uri_string() { diff --git a/user_guide_src/source/general/models.rst b/user_guide_src/source/general/models.rst index c4fd12476..1cfe736de 100644 --- a/user_guide_src/source/general/models.rst +++ b/user_guide_src/source/general/models.rst @@ -137,7 +137,7 @@ view:: { $this->load->model('blog'); - $data['query'] = $this->Blog->get_last_ten_entries(); + $data['query'] = $this->blog->get_last_ten_entries(); $this->load->view('blog', $data); } |