branch/3.1: merged bugfixesfrom trunk/ up to r2880; correct svn:mergeinfo property

1 files changed, 4 insertions, 4 deletions

diff --git a/framework/Collections/TQueue.php b/framework/Collections/TQueue.php
index 1eacfb0a..581a7109 100644
--- a/framework/Collections/TQueue.php
+++ b/framework/Collections/TQueue.php
@@ -4,7 +4,7 @@
  *

  * @author Qiang Xue <qiang.xue@gmail.com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Collections

@@ -105,8 +105,8 @@ class TQueue extends TComponent implements IteratorAggregate,Countable
 	}

 

 	/**

-	 * Returns the item at the top of the queue.

-	 * Unlike {@link pop()}, this method does not remove the item from the queue.

+	 * Returns the first item at the front of the queue.

+	 * Unlike {@link dequeue()}, this method does not remove the item from the queue.

 	 * @return mixed item at the top of the queue

 	 * @throws TInvalidOperationException if the queue is empty

 	 */

@@ -115,7 +115,7 @@ class TQueue extends TComponent implements IteratorAggregate,Countable
 		if($this->_c===0)

 			throw new TInvalidOperationException('queue_empty');

 		else

-			return $this->_d[$this->_c-1];

+			return $this->_d[0];

 	}

 

 	/**