diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-09-11 12:55:17 +0200 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-09-11 12:55:17 +0200 |
commit | ca731d1db0df869c0a8629fd1518eeadac45fd5d (patch) | |
tree | 25efe81af14fb2f0fd5709c3e9833dad22d52199 /user_guide/libraries | |
parent | dd3b41544b2ac5dbac7f8240fa1ebb957fd43534 (diff) | |
parent | 61bb5012ba51ebbe5af11ef9d21741474f9f970d (diff) |
Merge pull request #426 from appleboy/guide
Update user guide
Diffstat (limited to 'user_guide/libraries')
-rw-r--r-- | user_guide/libraries/output.html | 14 | ||||
-rw-r--r-- | user_guide/libraries/user_agent.html | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 7361d7961..64ba482ce 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -82,12 +82,12 @@ For example, if you build a page in one of your controller functions, don't set <p>Permits you to set the mime-type of your page so you can serve JSON data, JPEG's, XML, etc easily.</p> -<code>$this->output<br/> - ->set_content_type('application/json')<br/> - ->set_output(json_encode(array('foo' => 'bar')));<br/> -<br/> -$this->output<br/> - ->set_content_type('jpeg') // You could also use ".jpeg" which will have the full stop removed before looking in config/mimes.php<br/> +<code>$this->output<br /> + ->set_content_type('application/json')<br /> + ->set_output(json_encode(array('foo' => 'bar')));<br /> +<br /> +$this->output<br /> + ->set_content_type('jpeg') // You could also use ".jpeg" which will have the full stop removed before looking in config/mimes.php<br /> ->set_output(file_get_contents('files/something.jpg'));</code> <p><strong>Important:</strong> Make sure any non-mime string you pass to this method exists in config/mimes.php or it will have no effect.</p> @@ -174,4 +174,4 @@ Next Topic: <a href="pagination.html">Pagination Class</a> </div> </body> -</html>
\ No newline at end of file +</html> diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index e1d3640d3..d6641c883 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -133,7 +133,7 @@ You can find this list in <dfn>application/config/user_agents.php</dfn> if you w else if ($this->agent->is_mobile())<br /> {<br /> $this->load->view('mobile/home');<br /> -}<br/> +}<br /> else<br /> {<br /> $this->load->view('web/home');<br /> @@ -223,4 +223,4 @@ Next Topic: <a href="xmlrpc.html">XML-RPC Class</a> </div> </body> -</html>
\ No newline at end of file +</html> |