diff options
| -rw-r--r-- | system/database/DB_utility.php | 4 | ||||
| -rw-r--r-- | system/helpers/download_helper.php | 10 | ||||
| -rw-r--r-- | system/libraries/Migration.php | 4 | ||||
| -rw-r--r-- | user_guide_src/source/database/utilities.rst | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php index ecfda522c..9eac2ec41 100644 --- a/system/database/DB_utility.php +++ b/system/database/DB_utility.php @@ -316,7 +316,7 @@ abstract class CI_DB_utility { * Database Backup * * @param array $params - * @return mixed + * @return string */ public function backup($params = array()) { @@ -417,7 +417,7 @@ abstract class CI_DB_utility { return gzencode($this->_backup($prefs)); } - return; + return ''; } } diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php index 2710a4ac7..95c94a1b8 100644 --- a/system/helpers/download_helper.php +++ b/system/helpers/download_helper.php @@ -59,13 +59,13 @@ if ( ! function_exists('force_download')) * @param string filename * @param mixed the data to be downloaded * @param bool whether to try and send the actual file MIME type - * @return bool + * @return void */ function force_download($filename = '', $data = '', $set_mime = FALSE) { if ($filename === '' OR $data === '') { - return FALSE; + return; } elseif ($data === NULL) { @@ -77,7 +77,7 @@ if ( ! function_exists('force_download')) } else { - return FALSE; + return; } } else @@ -98,7 +98,7 @@ if ( ! function_exists('force_download')) /* If we're going to detect the MIME type, * we'll need a file extension. */ - return FALSE; + return; } // Load the mime types @@ -125,7 +125,7 @@ if ( ! function_exists('force_download')) if ($data === NULL && ($fp = @fopen($filepath, 'rb')) === FALSE) { - return FALSE; + return; } // Clean output buffer diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php index f61814988..ae36a3b45 100644 --- a/system/libraries/Migration.php +++ b/system/libraries/Migration.php @@ -421,11 +421,11 @@ class CI_Migration { * Stores the current schema version * * @param string $migration Migration reached - * @return object Outputs a report of the migration + * @return void */ protected function _update_version($migration) { - return $this->db->update($this->_migration_table, array( + $this->db->update($this->_migration_table, array( 'version' => $migration )); } diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst index 7886be434..2aeadfdda 100644 --- a/user_guide_src/source/database/utilities.rst +++ b/user_guide_src/source/database/utilities.rst @@ -252,8 +252,8 @@ Class Reference .. php:method:: backup([$params = array()]) :param array $params: An associative array of options - :returns: mixed - :rtype: void + :returns: string + :rtype: string Perform a database backup, per user preferences. |