summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-12-17 14:34:52 +0100
committerAndrey Andreev <narf@bofh.bg>2012-12-17 14:34:52 +0100
commitfc7024e0ecbbc5fd268888b57da96b5ba7a0150a (patch)
tree3956542f16e3573cac68fdebd7fe09e6f388bf8f /system/libraries
parent6a53709e448bd6fd2603ede85ddd34b3388ec11f (diff)
parent4296a65693504736b5e65bee5b163fa08cacb563 (diff)
Merge pull request #2077 from AndrewPodner/develop
update for Issue #2064 - take 2
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Email.php34
-rw-r--r--system/libraries/Encrypt.php6
-rw-r--r--system/libraries/Form_validation.php8
-rw-r--r--system/libraries/Zip.php2
4 files changed, 25 insertions, 25 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 5d8fc8aea..365a8bc79 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -406,7 +406,7 @@ class CI_Email {
* Initialize preferences
*
* @param array
- * @return void
+ * @return CI_Email
*/
public function initialize($config = array())
{
@@ -440,7 +440,7 @@ class CI_Email {
* Initialize the Email Data
*
* @param bool
- * @return object
+ * @return CI_Email
*/
public function clear($clear_attachments = FALSE)
{
@@ -474,7 +474,7 @@ class CI_Email {
* @param string $from
* @param string $name
* @param string $return_path = NULL Return-Path
- * @return object
+ * @return CI_Email
*/
public function from($from, $name = '', $return_path = NULL)
{
@@ -522,7 +522,7 @@ class CI_Email {
*
* @param string
* @param string
- * @return object
+ * @return CI_Email
*/
public function reply_to($replyto, $name = '')
{
@@ -558,7 +558,7 @@ class CI_Email {
* Set Recipients
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function to($to)
{
@@ -586,7 +586,7 @@ class CI_Email {
* Set CC
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function cc($cc)
{
@@ -614,7 +614,7 @@ class CI_Email {
*
* @param string
* @param string
- * @return object
+ * @return CI_Email
*/
public function bcc($bcc, $limit = '')
{
@@ -649,7 +649,7 @@ class CI_Email {
* Set Email Subject
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function subject($subject)
{
@@ -664,7 +664,7 @@ class CI_Email {
* Set Body
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function message($body)
{
@@ -693,7 +693,7 @@ class CI_Email {
* @param string $disposition = 'attachment'
* @param string $newname = NULL
* @param string $mime = ''
- * @return object
+ * @return CI_Email
*/
public function attach($filename, $disposition = '', $newname = NULL, $mime = '')
{
@@ -746,7 +746,7 @@ class CI_Email {
* Set Multipart Value
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function set_alt_message($str = '')
{
@@ -760,7 +760,7 @@ class CI_Email {
* Set Mailtype
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function set_mailtype($type = 'text')
{
@@ -774,7 +774,7 @@ class CI_Email {
* Set Wordwrap
*
* @param bool
- * @return object
+ * @return CI_Email
*/
public function set_wordwrap($wordwrap = TRUE)
{
@@ -788,7 +788,7 @@ class CI_Email {
* Set Protocol
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function set_protocol($protocol = 'mail')
{
@@ -802,7 +802,7 @@ class CI_Email {
* Set Priority
*
* @param int
- * @return object
+ * @return CI_Email
*/
public function set_priority($n = 3)
{
@@ -816,7 +816,7 @@ class CI_Email {
* Set Newline Character
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function set_newline($newline = "\n")
{
@@ -830,7 +830,7 @@ class CI_Email {
* Set CRLF
*
* @param string
- * @return object
+ * @return CI_Email
*/
public function set_crlf($crlf = "\n")
{
diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php
index cdb0a6452..e54ce4950 100644
--- a/system/libraries/Encrypt.php
+++ b/system/libraries/Encrypt.php
@@ -122,7 +122,7 @@ class CI_Encrypt {
* Set the encryption key
*
* @param string
- * @return object
+ * @return CI_Encrypt
*/
public function set_key($key = '')
{
@@ -419,7 +419,7 @@ class CI_Encrypt {
* Set the Mcrypt Cipher
*
* @param int
- * @return object
+ * @return CI_Encrypt
*/
public function set_cipher($cipher)
{
@@ -433,7 +433,7 @@ class CI_Encrypt {
* Set the Mcrypt Mode
*
* @param int
- * @return object
+ * @return CI_Encrypt
*/
public function set_mode($mode)
{
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index 68534251b..32f7da1b1 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -149,7 +149,7 @@ class CI_Form_validation {
* @param mixed $field
* @param string $label
* @param mixed $rules
- * @return object
+ * @return CI_Form_validation
*/
public function set_rules($field, $label = '', $rules = '')
{
@@ -266,7 +266,7 @@ class CI_Form_validation {
*
* @param array
* @param string
- * @return object
+ * @return CI_Form_validation
*/
public function set_message($lang, $val = '')
{
@@ -288,7 +288,7 @@ class CI_Form_validation {
*
* @param string
* @param string
- * @return object
+ * @return CI_Form_validation
*/
public function set_error_delimiters($prefix = '<p>', $suffix = '</p>')
{
@@ -829,7 +829,7 @@ class CI_Form_validation {
{
return sprintf($line, $field, $param);
}
-
+
return str_replace(array('{field}', '{param}'), array($field, $param), $line);
}
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 5eb33d29c..740e99c72 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -438,7 +438,7 @@ class CI_Zip {
* Lets you clear current zip data. Useful if you need to create
* multiple zips with different data.
*
- * @return object
+ * @return CI_Zip
*/
public function clear_data()
{