Permalink
Browse files

Merge pull request #2077 from AndrewPodner/develop

update for Issue #2064 - take 2
  • Loading branch information...
2 parents 6a53709 + 4296a65 commit fc7024e0ecbbc5fd268888b57da96b5ba7a0150a @narfbg narfbg committed Dec 17, 2012
@@ -143,7 +143,7 @@ public function get_output()
* Sets the output string.
*
* @param string $output Output data
- * @return object $this
+ * @return CI_Output
*/
public function set_output($output)
{
@@ -159,7 +159,7 @@ public function set_output($output)
* Appends data onto the output string.
*
* @param string $output Data to append
- * @return object $this
+ * @return CI_Output
*/
public function append_output($output)
{
@@ -187,7 +187,7 @@ public function append_output($output)
*
* @param string $header Header
* @param bool $replace Whether to replace the old header value, if already set
- * @return object $this
+ * @return CI_Output
*/
public function set_header($header, $replace = TRUE)
{
@@ -211,7 +211,7 @@ public function set_header($header, $replace = TRUE)
*
* @param string $mime_type Extension of the file we're outputting
* @param string $charset Character set (default: NULL)
- * @return object $this
+ * @return CI_Output
*/
public function set_content_type($mime_type, $charset = NULL)
{
@@ -308,7 +308,7 @@ public function get_header($header)
*
* @param int $code Status code (default: 200)
* @param string $text Optional message
- * @return object $this
+ * @return CI_Output
*/
public function set_status_header($code = 200, $text = '')
{
@@ -322,7 +322,7 @@ public function set_status_header($code = 200, $text = '')
* Enable/disable Profiler
*
* @param bool $val TRUE to enable or FALSE to disable
- * @return object $this
+ * @return CI_Output
*/
public function enable_profiler($val = TRUE)
{
@@ -339,7 +339,7 @@ public function enable_profiler($val = TRUE)
* Profiler section display.
*
* @param array $sections Profiler sections
- * @return object $this
+ * @return CI_Output
*/
public function set_profiler_sections($sections)
{
@@ -363,7 +363,7 @@ public function set_profiler_sections($sections)
* Set Cache
*
* @param int $time Cache expiration time in seconds
- * @return object $this
+ * @return CI_Output
*/
public function cache($time)
{
@@ -151,7 +151,7 @@ public function __construct()
/**
* CSRF Verify
*
- * @return object
+ * @return CI_Security
*/
public function csrf_verify()
{
@@ -202,7 +202,7 @@ public function csrf_verify()
* CSRF Set Cookie
*
* @codeCoverageIgnore
- * @return object
+ * @return CI_Security
*/
public function csrf_set_cookie()
{
@@ -229,7 +229,7 @@ public function drop_database($db_name)
*
* @param string $key
* @param bool $primary
- * @return object
+ * @return CI_DB_forge
*/
public function add_key($key = '', $primary = FALSE)
{
@@ -266,7 +266,7 @@ public function add_key($key = '', $primary = FALSE)
* Add Field
*
* @param array $field
- * @return object
+ * @return CI_DB_forge
*/
public function add_field($field = '')
{
Oops, something went wrong.

0 comments on commit fc7024e

Please sign in to comment.