Skip to content

Commit

Permalink
Remove dependency for language file loading - not used in here, and i…
Browse files Browse the repository at this point in the history
…t breaks the installer

git-svn-id: https://xerteonlinetoolkits.googlecode.com/svn/trunk@276 912cdd6b-5c7d-d5a7-a2ba-d0f0cdb91641
  • Loading branch information
Dave Goodwin committed Mar 5, 2012
1 parent 3390e8a commit b0a0aaf
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions website_code/php/database_library.php
Expand Up @@ -25,14 +25,9 @@
* @version 1.0
* @author Patrick Lockley
*/

function database_connect($success_string, $error_string){


global $xerte_toolkits_site;

_load_language_file('website_code/php/database_library.inc'); // _load_language_file("/website_code/php/database_library.inc");

/*
* Try to connect
*/
Expand Down Expand Up @@ -85,7 +80,7 @@ function database_connect($success_string, $error_string){
* @return mysql resultset.
*/
function db_query($sql, $params = array()) {
$connection = database_connect('db_Query ok', 'db_query fail');
$connection = database_connect('db_query ok', 'db_query fail');

foreach($params as &$value) {
if(isset($value)) {
Expand Down Expand Up @@ -131,12 +126,17 @@ function db_query($sql, $params = array()) {
return $result;
}

/**
* Convienance query for db_query - retrieve one row
* @param string $sql
* @param array $params (optional)
* @return array (db row) or null
*/
function db_query_one($sql, $params = array()) {
$results = db_query($sql, $params);

if(sizeof($results) > 0) {
return $results[0];
}
return null;
}

?>

0 comments on commit b0a0aaf

Please sign in to comment.