#4694 add feedback during installation, remove warnings

skala
Laurent Opprecht 13 years ago
parent 3460e9492f
commit 4137c340b4
  1. 13
      main/inc/lib/database.lib.php
  2. 2
      main/inc/lib/main_api.lib.php

@ -418,9 +418,16 @@ class Database {
if (!isset($parameters['client_flags'])) {
$parameters['client_flags'] = 0;
}
return $parameters['persistent']
? mysql_pconnect($parameters['server'], $parameters['username'], $parameters['password'], $parameters['client_flags'])
: mysql_connect($parameters['server'], $parameters['username'], $parameters['password'], $parameters['new_link'], $parameters['client_flags']);
$persistent = isset($parameters['persistent']) ? $parameters['persistent'] : null;
$server = isset($parameters['server']) ? $parameters['server'] : null;
$username = isset($parameters['username']) ? $parameters['username'] : null;
$password = isset($parameters['password']) ? $parameters['password'] : null;
$client_flag = isset($parameters['client_flags']) ? $parameters['client_flags'] : null;
$new_link = isset($parameters['new_link']) ? $parameters['new_link'] : null;
return $persistent
? mysql_pconnect($server, $username, $password, $client_flags)
: mysql_connect($server, $username, $password, $new_link, $client_flags);
}
/**

@ -1062,7 +1062,7 @@ function api_get_user_info_from_username($username = '') {
* Returns the current course code (string)
*/
function api_get_course_id() {
return $GLOBALS['_cid'];
return isset($GLOBALS['_cid']) ? $GLOBALS['_cid'] : null;
}
/**

Loading…
Cancel
Save