Permalink
Browse files

Merge branch 'refs/heads/hotfix-doc' into 3.2/develop

  • Loading branch information...
2 parents 6d4cec7 + e13cf2e commit 7ba4569076d68bfa40a37e15885c9d3b2e98f0e5 Matthew A. Mattson committed May 29, 2012
Showing with 7 additions and 6 deletions.
  1. +3 −2 ChangeLog.txt
  2. +4 −4 classes/base/db/connection/pool.php
View
@@ -2,6 +2,7 @@ Change Log for LEAP ORM
2012-05-25
* Reworked the internal workings of the connection pool, adding the ability to create new connections and to limit the number of connections.
+* Removed some unneeded, commented code.
2012-05-20
* Renamed some variables to better describe their usage in connection classes.
@@ -152,7 +153,7 @@ Change Log for LEAP ORM
2011-12-31
* Started to rework schema classes.
* Adding a new plugin for Drizzle.
-* Fixed class name captilization in Base_DB_MsSQL_Update_Builder and DB_MsSQL_Update_Builder.
+* Fixed class name capitalization in Base_DB_MsSQL_Update_Builder and DB_MsSQL_Update_Builder.
* Fixed a copy/paste bug in Base_DB_SQLite_Expression::prepare_identifier($expr).
* Updated inline documentation.
@@ -210,7 +211,7 @@ Change Log for LEAP ORM
* Added logic to increment/decrement size in Base_DB_ResultSet::offsetSet() and Base_DB_ResultSet::offsetUnset().
* Standardized some code in accordance with Kohana's Conventions and Coding Style.
- Replaced all { } with {}.
- - Standandized type casts.
+ - Standardized type casts.
- Added space around !.
* Changed connection classes from std to standard.
* Added MySQLi driver classes for MySQL.
@@ -21,7 +21,7 @@
*
* @package Leap
* @category Connection
- * @version 2012-05-25
+ * @version 2012-05-26
*
* @see http://stackoverflow.com/questions/1353822/how-to-implement-database-connection-pool-in-php
* @see http://www.webdevelopersjournal.com/columns/connection_pool.html
@@ -61,8 +61,8 @@
/**
* This variable stores the id of the current connection.
*
- * @access protected
- * @var string
+ * @access protected
+ * @var string
*/
protected $connection_id = NULL;
@@ -132,7 +132,7 @@ public function __set($key, $value) {
/**
* This function returns the appropriate connection from the pool. When there are
* multiple connections created from the same data source, the last opened connection
- * will be used when $new is set to "FALSE."
+ * will be returned when $new is set to "FALSE."
*
* @access public
* @param DB_DataSource $source the data source configurations

0 comments on commit 7ba4569

Please sign in to comment.