badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more PDO compat

Browse source
This commit is contained in:
Shish 2010-12-31 20:25:03 +00:00
parent ffb1762280
commit 6b557983c4
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/config.class.php
View file

@ -175,7 +175,7 @@ class DatabaseConfig extends BaseConfig {
$this->values = $cached;
}
else {
$this->values = $this->database->db->GetAssoc("SELECT name, value FROM config");
$this->values = $this->database->db->query("SELECT name, value FROM config")->fetchAll();
$this->database->cache->set("config", $this->values);
}
}

7
core/database.class.php
View file

@ -274,6 +274,7 @@ class Database {
global $database_dsn, $cache_dsn;
# FIXME: translate database URI into something PDO compatible
include "config.php";
#$db_proto = $database_dsn;
#$db_host = $database_dsn;
#$db_name = $database_dsn;
@ -320,7 +321,7 @@ class Database {
* Execute an SQL query and return a 2D array
*/
public function get_all($query, $args=array()) {
$result = $this->db->fetchAll($query, $args);
$result = $this->db->query($query, $args)->fetchAll();
return $result;
}
@ -328,12 +329,12 @@ class Database {
* Execute an SQL query and return a single row
*/
public function get_row($query, $args=array()) {
$result = $this->db->fetch($query, $args);
$result = $this->db->query($query, $args)->fetchAll();
if(count($result) == 0) {
return null;
}
else {
return $result;
return $result[0];
}
}