[vanillin commit] r283 - trunk/library/Framework

[codesite...@google.com]

Author: helgith
Date: Sun Sep 30 13:57:44 2007
New Revision: 283

Modified:
trunk/library/Framework/Database.php

Log:
That userInfo function was using the wrong variable

Modified: trunk/library/Framework/Database.php
==============================================================================
--- trunk/library/Framework/Database.php (original)
+++ trunk/library/Framework/Database.php Sun Sep 30 13:57:44 2007
@@ -54,7 +54,7 @@
}
return true;
}
-
+
/**
* ConnectionError
*
@@ -80,7 +80,7 @@
if (MDB2::isError($status)) {
$this->Context->ErrorManager->AddError(
$SqlBuilder->Context,
- $SenderObject,
+ $SenderObject,
$SenderMethod,
$ErrorMessage,
$status->getMessage() . ' ' . $db->getUserInfo(),
@@ -93,7 +93,7 @@

/**
* Execute
- */
+ */
function Execute($Sql, $SenderObject, $SenderMethod, $ErrorMessage, $KillOnFail = '1')
{
if (strtolower(substr($Sql, 0, 6)) == 'select') {
@@ -155,7 +155,7 @@

/**
* DoConnection
- *
+ *
* @access private
* @param bool $farm
* @return mixed
@@ -192,7 +192,7 @@

/**
* SetCharacterEncoding
- *
+ *
* @access private
* @since 0.1.0
*/
@@ -230,18 +230,18 @@
}
$this->SetCharacterEncoding();
}
- return $this->Connection;
+ return $this->Connection;
}

/**
* GetFarmConnection
*
* Attempts to create a database connection to a farm backend.
- *
+ *
* @access private
* @todo Figure out how this works. ;-)
* @return mixed
- */
+ */
function GetFarmConnection()
{
if ($this->FarmConnection) {
@@ -276,7 +276,7 @@
* @param SqlBuilder
* @param SenderObject
* @param string
- * @param string
+ * @param string
* @param string
* @param string
* @todo Remove LAST_INSERT_ID in favour of nextId calls
@@ -317,7 +317,7 @@

/**
* RewindDataSet
- *
+ *
* @uses self::RowCount()
* @return void
*/
@@ -362,7 +362,7 @@
$SenderObject,
$SenderMethod,
$ErrorMessage,
- $DataSet->getMessage() . ' ' . $db->getUserInfo(),
+ $DataSet->getMessage() . ' ' . $DataSet->getUserInfo(),
$KillOnFail
);
return false;