diff options
Diffstat (limited to 'engine/lib/install.php')
| -rw-r--r-- | engine/lib/install.php | 53 |
1 files changed, 3 insertions, 50 deletions
diff --git a/engine/lib/install.php b/engine/lib/install.php index c47eedd40..47ad47e39 100644 --- a/engine/lib/install.php +++ b/engine/lib/install.php @@ -8,55 +8,8 @@ * @subpackage Installation */ -/** - * Returns whether or not the database has been installed - * - * @return true|false Whether the database has been installed - */ -function is_db_installed() { - global $CONFIG; - - if (isset($CONFIG->db_installed)) { - return $CONFIG->db_installed; - } - - if ($dblink = get_db_link('read')) { - mysql_query("select name from {$CONFIG->dbprefix}datalists limit 1", $dblink); - if (mysql_errno($dblink) > 0) { - return false; - } - } else { - return false; - } - - // Set flag if db is installed (if false then we want to check every time) - $CONFIG->db_installed = true; - - return true; -} - -/** - * Returns whether or not other settings have been set - * - * @return true|false Whether or not the rest of the installation has been followed through with - */ +// @todo - remove this internal function as soon as it is pulled from elgg_view() function is_installed() { global $CONFIG; - return datalist_get('installed'); -} - -/** - * Check that installation has completed and the database is populated. - * - * @throws InstallationException - * @return void - */ -function verify_installation() { - $installed = FALSE; - try { - $installed = is_installed(); - } catch (DatabaseException $e) {} - if (!$installed) { - throw new InstallationException(elgg_echo('InstallationException:SiteNotInstalled')); - } -} + return $CONFIG->installed; +}
\ No newline at end of file |