From 9efc518bf0fa1e7d1be0e8a860bb5bdfdb77f1f5 Mon Sep 17 00:00:00 2001
From: Sebastiaan Lauwers <crashanddie@gmail.com>
Date: Tue, 4 Mar 2008 00:19:25 +0100
Subject: [PATCH] Obvious bugfixes

I've modified a few obvious typos and such.
	modified:   Source/carbon/database/Database.php
	modified:   Source/carbon/database/Database_driver.php
	modified:   Source/carbon/database/Database_utility.php
	modified:   Source/carbon/database/drivers/mssql/mssql_driver.php
	modified:   Source/carbon/database/drivers/mssql/mssql_result.php
	modified:   Source/carbon/utilities/url_utility.php
---
 Source/carbon/database/Database.php                   |  2 +-
 Source/carbon/database/Database_driver.php            |  4 ++--
 Source/carbon/database/Database_utility.php           |  2 +-
 Source/carbon/database/drivers/mssql/mssql_driver.php |  2 +-
 Source/carbon/database/drivers/mssql/mssql_result.php | 14 +++++++-------
 Source/carbon/utilities/url_utility.php               |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Source/carbon/database/Database.php b/Source/carbon/database/Database.php
index a85e88c..a682d8f 100644
--- a/Source/carbon/database/Database.php
+++ b/Source/carbon/database/Database.php
@@ -15,7 +15,7 @@ function &Database($params = '', $active_record = false)
 	{
 		include(APP_PATH . 'config/database' . FILE_EXT);
 
-		$group = ($params == '') ? $active_group : $params;
+		$group = ($params == '') ? $active_record : $params;
 
 		if (!isset($database[$group]))
 		{
diff --git a/Source/carbon/database/Database_driver.php b/Source/carbon/database/Database_driver.php
index 18d340e..5064546 100644
--- a/Source/carbon/database/Database_driver.php
+++ b/Source/carbon/database/Database_driver.php
@@ -347,7 +347,7 @@ class Carbon_Database_driver
 			return $sql;
 		}
 
-		if (!is_array($bind))
+		if (!is_array($binds))
 		{
 			$binds = array($binds);
 		}
@@ -517,7 +517,7 @@ class Carbon_Database_driver
 
 	public function field_exists($field_names, $table_name)
 	{
-		return (!in_array($field_name, $this->list_fields($table_name))) ? false : true;
+		return (!in_array($field_names, $this->list_fields($table_name))) ? false : true;
 	}
 
 	public function field_names($table = '')
diff --git a/Source/carbon/database/Database_utility.php b/Source/carbon/database/Database_utility.php
index 56bda75..0e02849 100644
--- a/Source/carbon/database/Database_utility.php
+++ b/Source/carbon/database/Database_utility.php
@@ -108,7 +108,7 @@ class Carbon_Database_utility
 			$result[$key] = $result;
 		}
 
-		return $results;
+		return $result;
 	}
 
 	public function repair_table($table_name)
diff --git a/Source/carbon/database/drivers/mssql/mssql_driver.php b/Source/carbon/database/drivers/mssql/mssql_driver.php
index c2c2217..1a3468e 100644
--- a/Source/carbon/database/drivers/mssql/mssql_driver.php
+++ b/Source/carbon/database/drivers/mssql/mssql_driver.php
@@ -166,7 +166,7 @@ class Carbon_Database_mssql_driver extends Carbon_Database
 
 	public function database_insert($table, $keys, $values)
 	{
-		return "INSERT INTO " . $this->database_escape_table($table) . " (" . implode(', ', $key) . ") VALUES (" . implode(', ', $values) . ")";
+		return "INSERT INTO " . $this->database_escape_table($table) . " (" . implode(', ', $keys) . ") VALUES (" . implode(', ', $values) . ")";
 	}
 
 	public function database_update($table, $values, $where)
diff --git a/Source/carbon/database/drivers/mssql/mssql_result.php b/Source/carbon/database/drivers/mssql/mssql_result.php
index bad6bb4..c71009d 100644
--- a/Source/carbon/database/drivers/mssql/mssql_result.php
+++ b/Source/carbon/database/drivers/mssql/mssql_result.php
@@ -11,17 +11,17 @@ if (!defined('CARBON_PATH'))
 
 class Carbon_Database_mssql_result extends Carbon_Database_result
 {
-	public num_rows()
+	public function num_rows()
 	{
 		return @mssql_num_rows($this->result_id);
 	}
 
-	public num_fields()
+	public function num_fields()
 	{
 		return @mssql_num_fields($this->result_id);
 	}
 
-	public list_fields()
+	public function list_fields()
 	{
 		$field_names = array();
 
@@ -52,7 +52,7 @@ class Carbon_Database_mssql_result extends Carbon_Database_result
 		return $retval;
 	}
 
-	public free_result()
+	public function free_result()
 	{
 		if (is_resource($this->result_id))
 		{
@@ -61,17 +61,17 @@ class Carbon_Database_mssql_result extends Carbon_Database_result
 		}
 	}
 
-	public database_data_seek($index = 0)
+	public function database_data_seek($index = 0)
 	{
 		return mssql_data_seek($this->result_id, $index);
 	}
 
-	public database_fetch_assoc()
+	public function database_fetch_assoc()
 	{
 		return mssql_fetch_assoc($this->result_id);
 	}
 
-	public database_fetch_object()
+	public function database_fetch_object()
 	{
 		return mssql_fetch_object($this->result_id);
 	}
diff --git a/Source/carbon/utilities/url_utility.php b/Source/carbon/utilities/url_utility.php
index a910b45..6a8463c 100644
--- a/Source/carbon/utilities/url_utility.php
+++ b/Source/carbon/utilities/url_utility.php
@@ -63,7 +63,7 @@ function anchor($uri = '', $title = '', $attributes = '')
 function anchor_popup($uri = '', $title = '', $attributes = false)
 {
 	$title = (string) $title;
-	$site_url (!preg_match('!^\w+://!i', $uri)) ? site_url($uri) : $uri;
+	$site_url = (!preg_match('!^\w+://!i', $uri)) ? site_url($uri) : $uri;
 
 	if ($title == '')
 	{
-- 
2.11.4.GIT