From 115ae3f1df1ba94cfcfeca7c899cbea714d2a578 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Wed, 9 Sep 2009 19:12:00 +1000
Subject: [PATCH 001/244] Updating CakePHP version.

---
 cake/config/config.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/config/config.php b/cake/config/config.php
index 24718485b..baecc26de 100644
--- a/cake/config/config.php
+++ b/cake/config/config.php
@@ -22,5 +22,5 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-return $config['Cake.version'] = '1.2.4.8284';
-?>
\ No newline at end of file
+return $config['Cake.version'] = '1.2.5';
+?>

From c48d9794f6dff2472bd7e9bad4011ece408620b4 Mon Sep 17 00:00:00 2001
From: jperras <joel.perras@gmail.com>
Date: Wed, 9 Sep 2009 21:15:22 -0400
Subject: [PATCH 002/244] Fixing incorrect optional parameters passed to
 TreeBehavior::children() in TreeBehavior test case. Fixes errors & test
 failures when running under PHP 5.3.

---
 .../cases/libs/model/behaviors/tree.test.php      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/cake/tests/cases/libs/model/behaviors/tree.test.php b/cake/tests/cases/libs/model/behaviors/tree.test.php
index 2d030cb4c..147da89ae 100644
--- a/cake/tests/cases/libs/model/behaviors/tree.test.php
+++ b/cake/tests/cases/libs/model/behaviors/tree.test.php
@@ -1128,12 +1128,12 @@ function testNoAmbiguousColumn() {
 		$data = $this->Tree->find(array($modelClass . '.name' => '1. Root'));
 		$this->Tree->id= $data[$modelClass]['id'];
 
-		$direct = $this->Tree->children(null, true, array('id', 'name', $parentField, $leftField, $rightField), null, null, null, 1);
+		$direct = $this->Tree->children(null, true, array('id', 'name', $parentField, $leftField, $rightField));
 		$expects = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)),
 			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 8, $rightField => 13)));
 		$this->assertEqual($direct, $expects);
 
-		$total = $this->Tree->children(null, null, array('id', 'name', $parentField, $leftField, $rightField), null, null, null, 1);
+		$total = $this->Tree->children(null, null, array('id', 'name', $parentField, $leftField, $rightField));
 		$expects = array(
 			array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)),
 			array($modelClass => array('id' => 3, 'name' => '1.1.1', $parentField => 2, $leftField => 3, $rightField => 4)),
@@ -1717,7 +1717,7 @@ function testChildren() {
 		$this->Tree->initialize(2, 2);
 
 		$data = $this->Tree->find(array($modelClass . '.name' => '1. Root'));
-		$this->Tree->id= $data[$modelClass]['id'];
+		$this->Tree->id = $data[$modelClass]['id'];
 
 		$direct = $this->Tree->children(null, true, array('name', $leftField, $rightField));
 		$expects = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
@@ -1742,19 +1742,20 @@ function testChildren() {
 	function testNoAmbiguousColumn() {
 		extract($this->settings);
 		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
 		$this->Tree->bindModel(array('belongsTo' => array('Dummy' =>
 			array('className' => $modelClass, 'foreignKey' => $parentField, 'conditions' => array('Dummy.id' => null)))), false);
-		$this->Tree->initialize(2, 2);
 
 		$data = $this->Tree->find(array($modelClass . '.name' => '1. Root'));
-		$this->Tree->id= $data[$modelClass]['id'];
+		$this->Tree->id = $data[$modelClass]['id'];
 
-		$direct = $this->Tree->children(null, true, array('name', $leftField, $rightField), null, null, null, 1);
+		$direct = $this->Tree->children(null, true, array('name', $leftField, $rightField));
 		$expects = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
 			array($modelClass => array('name' => '1.2', $leftField => 8, $rightField => 13)));
 		$this->assertEqual($direct, $expects);
 
-		$total = $this->Tree->children(null, null, array('name', $leftField, $rightField), null, null, null, 1);
+		$total = $this->Tree->children(null, null, array('name', $leftField, $rightField));
 		$expects = array(
 			array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
 			array($modelClass => array('name' => '1.1.1', $leftField => 3, $rightField => 4)),

From 0065005f95a9df7f2c39f6bc193532d9000efb34 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 10 Sep 2009 09:56:20 -0400
Subject: [PATCH 003/244] Fixing custom error class not being used if error for
 field is a named index. Test case added. Fixes #76

---
 cake/libs/view/helpers/form.php                  |  7 +++----
 cake/tests/cases/libs/view/helpers/form.test.php | 13 +++++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 0dcc1c140..1bbca6995 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -408,11 +408,10 @@ function error($field, $text = null, $options = array()) {
 			if (is_array($text) && is_numeric($error) && $error > 0) {
 				$error--;
 			}
-			if (is_array($text) && isset($text[$error])) {
-				$text = $text[$error];
-			} elseif (is_array($text)) {
+			if (is_array($text)) {
 				$options = array_merge($options, $text);
-				$text = null;
+				$text = isset($text[$error]) ? $text[$error] : null;
+				unset($options[$error]);
 			}
 
 			if ($text != null) {
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index af00110fd..5712d81e8 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -2235,14 +2235,14 @@ function testDefaultValue() {
 		$this->assertTags($result, array('input' => array('type' => 'text', 'name' => 'data[Model][field]', 'value' => 'default value', 'id' => 'ModelField')));
 	}
 /**
- * testFieldError method
+ * testError method
  *
  * Test field error generation
  *
  * @access public
  * @return void
  */
-	function testFieldError() {
+	function testError() {
 		$this->Form->validationErrors['Model']['field'] = 1;
 		$result = $this->Form->error('Model.field');
 		$this->assertTags($result, array('div' => array('class' => 'error-message'), 'Error in field Field', '/div'));
@@ -2269,6 +2269,15 @@ function testFieldError() {
 
 		$result = $this->Form->error('Model.field', "<strong>Badness!</strong>", array('wrap' => false, 'escape' => false));
 		$this->assertEqual($result, '<strong>Badness!</strong>');
+
+		$this->Form->validationErrors['Model']['field'] = "email";
+		$result = $this->Form->error('Model.field', array('class' => 'field-error', 'email' => 'No good!'));
+		$expected = array(
+			'div' => array('class' => 'field-error'),
+			'No good!',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
 	}
 /**
  * testPassword method

From 793c6ec07a5c0f7da6694e92892bf7c7ae719268 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 15 Sep 2009 22:00:04 -0400
Subject: [PATCH 004/244] Making DboSybase able to return VIEW's as part of
 listSources(), making it similar to DboPostgres and DboMysql.  Fixes #91

---
 cake/libs/model/datasources/dbo/dbo_sybase.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_sybase.php b/cake/libs/model/datasources/dbo/dbo_sybase.php
index 9e2a11851..2c154ef21 100644
--- a/cake/libs/model/datasources/dbo/dbo_sybase.php
+++ b/cake/libs/model/datasources/dbo/dbo_sybase.php
@@ -132,7 +132,7 @@ function listSources() {
 			return $cache;
 		}
 
-		$result = $this->_execute("select name from sysobjects where type='U'");
+		$result = $this->_execute("SELECT name FROM sysobjects WHERE type IN ('U', 'V')");
 		if (!$result) {
 			return array();
 		} else {
@@ -168,10 +168,11 @@ function describe(&$model) {
 				$column[0] = $column[$colKey[0]];
 			}
 			if (isset($column[0])) {
-				$fields[$column[0]['Field']] = array('type' => $this->column($column[0]['Type']),
-													'null' => $column[0]['Null'],
-													'length' => $this->length($column[0]['Type']),
-													);
+				$fields[$column[0]['Field']] = array(
+					'type' => $this->column($column[0]['Type']),
+					'null' => $column[0]['Null'],
+					'length' => $this->length($column[0]['Type']),
+				);
 			}
 		}
 

From e0b6b25365b780aaad86c80cb58f374208be35ef Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 17 Sep 2009 19:57:56 -0400
Subject: [PATCH 005/244] Fixing inherited public properties not being set in
 SessionHelper. Adding tests for SessionHelper construction and the setting of
 inherited properties.  Fixes #94

---
 cake/libs/session.php                               |  2 ++
 cake/tests/cases/libs/view/helpers/session.test.php | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/cake/libs/session.php b/cake/libs/session.php
index c90318c9a..7df6577df 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -151,6 +151,8 @@ function __construct($base = null, $start = true) {
 			if (strpos($this->host, ':') !== false) {
 				$this->host = substr($this->host, 0, strpos($this->host, ':'));
 			}
+		}
+		if (isset($_SESSION)) {
 			if (!class_exists('Security')) {
 				App::import('Core', 'Security');
 			}
diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php
index 06947b2b6..6f98c2acd 100644
--- a/cake/tests/cases/libs/view/helpers/session.test.php
+++ b/cake/tests/cases/libs/view/helpers/session.test.php
@@ -62,9 +62,8 @@ class SessionHelperTest extends CakeTestCase {
  * @access public
  * @return void
  */
-	function setUp() {
+	function startTest() {
 		$this->Session = new SessionHelper();
-		$this->Session->__start();
 
 		$_SESSION = array(
 			'test' => 'info',
@@ -103,6 +102,15 @@ function tearDown() {
 		$_SESSION = array();
 		unset($this->Session);
 	}
+/**
+ * test construction and initial property settings
+ *
+ * @return void
+ **/
+	function testConstruct() {
+		$this->assertFalse(empty($this->Session->sessionTime));
+		$this->assertFalse(empty($this->Session->security));
+	}
 /**
  * testRead method
  *

From 317049b7369025db730598f23a84bac425832e36 Mon Sep 17 00:00:00 2001
From: "renan.saddam" <renan.saddam@gmail.com>
Date: Thu, 17 Sep 2009 23:08:32 -0300
Subject: [PATCH 006/244] Fixing bug when value is '0', it was generating a
 blank node.

---
 cake/libs/xml.php                  |  4 ++--
 cake/tests/cases/libs/xml.test.php | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index 0d91825bc..437719a59 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -227,7 +227,7 @@ function normalize($object, $keyName = null, $options = array()) {
 			$chldObjs = get_object_vars($object);
 		} elseif (is_array($object)) {
 			$chldObjs = $object;
-		} elseif (!empty($object) || $object === 0) {
+		} elseif (!empty($object) || $object === 0 || $object === '0') {
 			$node->createTextNode($object);
 		}
 		$attr = array();
@@ -268,7 +268,7 @@ function normalize($object, $keyName = null, $options = array()) {
 							$node->normalize($val, $n, $options);
 						} elseif ($options['format'] == 'tags' && $this->__tagOptions($key) !== false) {
 							$tmp =& $node->createElement($key);
-							if (!empty($val) || $val === 0) {
+							if (!empty($val) || $val === 0 || $val === '0') {
 								$tmp->createTextNode($val);
 							}
 						} elseif ($options['format'] == 'attributes') {
diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php
index acff6c89b..793c573eb 100644
--- a/cake/tests/cases/libs/xml.test.php
+++ b/cake/tests/cases/libs/xml.test.php
@@ -176,6 +176,19 @@ function testSimpleObject() {
 		$expected = '<hello><![CDATA[world]]></hello>';
 		$this->assertEqual($expected, $result);
 	}
+/**
+ * testSimpleArrayWithZeroValues method
+ *
+ * @access public
+ * @return void
+ */
+	function testSimpleArrayWithZeroValues() {
+		$xml = new Xml(array('zero_string' => '0', 'zero_integer' => 0), array('format' => 'tags'));
+
+		$result = $xml->toString(false);
+		$expected = '<zero_string>0</zero_string><zero_integer>0</zero_integer>';
+		$this->assertEqual($expected, $result);
+	}
 /**
  * testHeader method
  *
@@ -761,7 +774,7 @@ function testElementCollapsing() {
 	}
 /**
  * test that empty values do not casefold collapse
- * 
+ *
  * @see http://code.cakephp.org/tickets/view/8
  * @return void
  **/
@@ -797,7 +810,7 @@ function testCaseFoldingWithEmptyValues() {
 				<name>varchar(45)</name>
 			</User>
 		</method>';
-		
+
 		$xml =& new XML($emptyValue);
 		$expected = array(
 			'Method' => array(

From 9b7a10a4bcba7b761f88e67f6c06e28537617a03 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 19 Sep 2009 00:20:40 -0400
Subject: [PATCH 007/244] Applying patch from 'michaelc' to optimize to
 Shell::out()

---
 cake/console/libs/shell.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php
index eed6bff8e..4ca89a3c4 100644
--- a/cake/console/libs/shell.php
+++ b/cake/console/libs/shell.php
@@ -346,11 +346,7 @@ function in($prompt, $options = null, $default = null) {
  */
 	function out($string, $newline = true) {
 		if (is_array($string)) {
-			$str = '';
-			foreach ($string as $message) {
-				$str .= $message ."\n";
-			}
-			$string = $str;
+			$string = implode("\n", $string) . "\n";
 		}
 		return $this->Dispatch->stdout($string, $newline);
 	}

From 5049265a492851715feee72834dd25229f7cd17c Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 20 Sep 2009 14:54:13 +0530
Subject: [PATCH 008/244] Fixed incorrect doc. block for TimerHelper::format

---
 cake/libs/view/helpers/time.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php
index 62792d909..179ca4409 100644
--- a/cake/libs/view/helpers/time.php
+++ b/cake/libs/view/helpers/time.php
@@ -519,7 +519,7 @@ function gmt($string = null) {
 		return $return;
 	}
 /**
- * Returns a UNIX timestamp, given either a UNIX timestamp or a valid strtotime() date string.
+ * Returns a formatted date string, given either a UNIX timestamp or a valid strtotime() date string.
  *
  * @param string $format date format string. defaults to 'd-m-Y'
  * @param string $dateString Datetime string

From 06fb86f1417e695343b1bad7012307edaf280960 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 20 Sep 2009 11:54:26 -0400
Subject: [PATCH 009/244] Fixing issue where sessions were not correctly
 started.

---
 cake/libs/session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/session.php b/cake/libs/session.php
index 7df6577df..136865689 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -152,7 +152,7 @@ function __construct($base = null, $start = true) {
 				$this->host = substr($this->host, 0, strpos($this->host, ':'));
 			}
 		}
-		if (isset($_SESSION)) {
+		if (isset($_SESSION) || $start === true) {
 			if (!class_exists('Security')) {
 				App::import('Core', 'Security');
 			}

From 7116c016420619938151ed03d63f175cac791702 Mon Sep 17 00:00:00 2001
From: "renan.saddam" <renan.saddam@gmail.com>
Date: Tue, 22 Sep 2009 17:47:11 -0300
Subject: [PATCH 010/244] Fixing Xml::toArray() when blank nodes are provided.
 Fixes #87.

---
 cake/libs/xml.php                  |  7 +++----
 cake/tests/cases/libs/xml.test.php | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index 437719a59..691cd5dba 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -672,7 +672,6 @@ function toArray($camelize = true) {
 				continue;
 			} elseif (isset($child->children[0]) && is_a($child->children[0], 'XmlTextNode')) {
 				$value = $child->children[0]->value;
-
 				if ($child->attributes) {
 					$value = array_merge(array('value' => $value), $child->attributes);
 				}
@@ -688,10 +687,10 @@ function toArray($camelize = true) {
 				continue;
 			} elseif (count($child->children) === 0 && $child->value == '') {
 				$value = $child->attributes;
-				if (isset($out[$child->name]) || isset($multi[$key])) {
+				if (isset($out[$key]) || isset($multi[$key])) {
 					if (!isset($multi[$key])) {
-						$multi[$key] = array($out[$child->name]);
-						unset($out[$child->name]);
+						$multi[$key] = array($out[$key]);
+						unset($out[$key]);
 					}
 					$multi[$key][] = $value;
 				} elseif (!empty($value)) {
diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php
index 793c573eb..82c5b5c17 100644
--- a/cake/tests/cases/libs/xml.test.php
+++ b/cake/tests/cases/libs/xml.test.php
@@ -1188,7 +1188,29 @@ function testToArray() {
 				)
 			)
 		));
+		$this->assertEqual($result, $expected);
 
+		$text = '<?xml version="1.0" encoding="UTF-8"?>
+		<root>
+			<child id="1" other="1" />
+			<child id="2" other="1" />
+			<child id="3" other="1" />
+			<child id="4" other="1" />
+			<child id="5" other="1" />
+		</root>';
+		$xml = new Xml($text);
+		$result = $xml->toArray();
+		$expected = array(
+			'Root' => array(
+				'Child' => array(
+					array('id' => 1, 'other' => 1),
+					array('id' => 2, 'other' => 1),
+					array('id' => 3, 'other' => 1),
+					array('id' => 4, 'other' => 1),
+					array('id' => 5, 'other' => 1)
+				)
+			)
+		);
 		$this->assertEqual($result, $expected);
 	}
 /**

From 07a89cd953d81514532b26a211afb4b609029a44 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Tue, 22 Sep 2009 02:30:52 +0530
Subject: [PATCH 011/244] Updated Html and Javascript helpers to suffix asset
 urls with timestamp even when the app is run off a subfolder on the domain

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/view/helpers/html.php                  | 14 +++++++-------
 cake/libs/view/helpers/javascript.php            | 16 ++++++----------
 cake/tests/cases/libs/view/helpers/html.test.php | 14 ++++++++++++--
 .../cases/libs/view/helpers/javascript.test.php  |  6 +++---
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index cb9408998..016ea799f 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -349,9 +349,7 @@ function css($path, $rel = null, $htmlAttributes = array(), $inline = true) {
 				}
 			}
 
-			$path = $this->webroot($path);
-
-			$url = $path;
+			$url = $this->webroot($path);
 			if (strpos($path, '?') === false && ((Configure::read('Asset.timestamp') === true && Configure::read() > 0) || Configure::read('Asset.timestamp') === 'force')) {
 				$url .= '?' . @filemtime(WWW_ROOT . str_replace('/', DS, $path));
 			}
@@ -434,13 +432,15 @@ function getCrumbs($separator = '&raquo;', $startText = false) {
 	function image($path, $options = array()) {
 		if (is_array($path)) {
 			$path = $this->url($path);
-		} elseif ($path[0] === '/') {
-			$path = $this->webroot($path);
 		} elseif (strpos($path, '://') === false) {
-			$path = $this->webroot(IMAGES_URL . $path);
+			if ($path[0] !== '/') {
+				$path = IMAGES_URL . $path;
+			}
 
 			if ((Configure::read('Asset.timestamp') == true && Configure::read() > 0) || Configure::read('Asset.timestamp') === 'force') {
-				$path .= '?' . @filemtime(str_replace('/', DS, WWW_ROOT . $path));
+				$path = $this->webroot($path) . '?' . @filemtime(WWW_ROOT . str_replace('/', DS, $path));
+			} else {
+				$path = $this->webroot($path);
 			}
 		}
 
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index 9756d62ed..8fd735f6f 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -214,11 +214,11 @@ function blockEnd() {
 		$options = $this->_blockOptions;
 		$this->_blockOptions = array();
 		$this->inBlock = false;
-		
+
 		if (empty($script)) {
 			return null;
 		}
-		
+
 		return $this->codeBlock($script, $options);
 	}
 /**
@@ -254,14 +254,10 @@ function link($url, $inline = true) {
 				}
 			}
 
-			$url = $this->webroot($url);
-			$timestampEnabled = (
-				(Configure::read('Asset.timestamp') === true && Configure::read() > 0) ||
-				Configure::read('Asset.timestamp') === 'force'
-			);
-
-			if (strpos($url, '?') === false && $timestampEnabled) {
-				$url .= '?' . @filemtime(WWW_ROOT . str_replace('/', DS, $url));
+			if (strpos($url, '?') === false && ((Configure::read('Asset.timestamp') === true && Configure::read() > 0) || Configure::read('Asset.timestamp') === 'force')) {
+				$url = $this->webroot($url) . '?' . @filemtime(WWW_ROOT . str_replace('/', DS, $url));
+			} else {
+				$url = $this->webroot($url);
 			}
 
 			if (Configure::read('Asset.filter.js')) {
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
index 52dd5cbaf..3b41dd1bc 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -307,6 +307,16 @@ function testImageTagWithTheme() {
 				'src' => 'preg:/themed\/default\/img\/cake\.power\.gif\?\d+/',
 				'alt' => ''
 		)));
+
+		$webroot = $this->Html->webroot;
+		$this->Html->webroot = '/testing/';
+		$result = $this->Html->image('cake.power.gif');
+		$this->assertTags($result, array(
+			'img' => array(
+				'src' => 'preg:/\/testing\/themed\/default\/img\/cake\.power\.gif\?\d+/',
+				'alt' => ''
+		)));
+		$this->Html->webroot = $webroot;
 	}
 /**
  * testStyle method
@@ -391,14 +401,14 @@ function testCssLink() {
 		$webroot = $this->Html->webroot;
 		$this->Html->webroot = '/testing/';
 		$result = $this->Html->css('cake.generic');
-		$expected['link']['href'] = 'preg:/\/testing\/css\/cake\.generic\.css\?/';
+		$expected['link']['href'] = 'preg:/\/testing\/css\/cake\.generic\.css\?[0-9]+/';
 		$this->assertTags($result, $expected);
 		$this->Html->webroot = $webroot;
 
 		$webroot = $this->Html->webroot;
 		$this->Html->webroot = '/testing/longer/';
 		$result = $this->Html->css('cake.generic');
-		$expected['link']['href'] = 'preg:/\/testing\/longer\/css\/cake\.generic\.css\?/';
+		$expected['link']['href'] = 'preg:/\/testing\/longer\/css\/cake\.generic\.css\?[0-9]+/';
 		$this->assertTags($result, $expected);
 		$this->Html->webroot = $webroot;
 	}
diff --git a/cake/tests/cases/libs/view/helpers/javascript.test.php b/cake/tests/cases/libs/view/helpers/javascript.test.php
index 7ebad00eb..1fdfccf21 100644
--- a/cake/tests/cases/libs/view/helpers/javascript.test.php
+++ b/cake/tests/cases/libs/view/helpers/javascript.test.php
@@ -262,11 +262,11 @@ function testFilteringAndTimestamping() {
 
 		$this->Javascript->webroot = '/testing/';
 		$result = $this->Javascript->link('__cake_js_test');
-		$this->assertPattern('/^<script[^<>]+src="\/testing\/js\/__cake_js_test\.js\?"[^<>]*>/', $result);
+		$this->assertPattern('/^<script[^<>]+src="\/testing\/js\/__cake_js_test\.js\?\d+"[^<>]*>/', $result);
 
 		$this->Javascript->webroot = '/testing/longer/';
 		$result = $this->Javascript->link('__cake_js_test');
-		$this->assertPattern('/^<script[^<>]+src="\/testing\/longer\/js\/__cake_js_test\.js\?"[^<>]*>/', $result);
+		$this->assertPattern('/^<script[^<>]+src="\/testing\/longer\/js\/__cake_js_test\.js\?\d+"[^<>]*>/', $result);
 
 		$this->Javascript->webroot = $webroot;
 		Configure::write('debug', $debug);
@@ -826,7 +826,7 @@ function testAfterRender() {
 		ob_start();
 		$this->Javascript->afterRender();
 		$result = ob_get_clean();
-		
+
 		$expected = array(
 			'script' => array('type' => 'text/javascript'),
 			$this->cDataStart,

From 022f8ccaa2501e71393513d774d5e41d4549cc87 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 22 Sep 2009 19:04:40 -0400
Subject: [PATCH 012/244] Making conditions easier to read. Adding additional
 test for image timestamping. Refs #108

---
 cake/libs/view/helpers/html.php                  | 7 +++++--
 cake/libs/view/helpers/javascript.php            | 6 +++++-
 cake/tests/cases/libs/view/helpers/html.test.php | 9 +++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index 016ea799f..b6b0fdd0e 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -348,9 +348,12 @@ function css($path, $rel = null, $htmlAttributes = array(), $inline = true) {
 					$path .= '.css';
 				}
 			}
-
+			$timestampEnabled = (
+				(Configure::read('Asset.timestamp') === true && Configure::read() > 0) ||
+				Configure::read('Asset.timestamp') === 'force'
+			);
 			$url = $this->webroot($path);
-			if (strpos($path, '?') === false && ((Configure::read('Asset.timestamp') === true && Configure::read() > 0) || Configure::read('Asset.timestamp') === 'force')) {
+			if (strpos($path, '?') === false && $timestampEnabled) {
 				$url .= '?' . @filemtime(WWW_ROOT . str_replace('/', DS, $path));
 			}
 
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index 8fd735f6f..8e9430dd9 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -253,8 +253,12 @@ function link($url, $inline = true) {
 					$url .= '.js';
 				}
 			}
+			$timestampEnabled = (
+				(Configure::read('Asset.timestamp') === true && Configure::read() > 0) ||
+				Configure::read('Asset.timestamp') === 'force'
+			);
 
-			if (strpos($url, '?') === false && ((Configure::read('Asset.timestamp') === true && Configure::read() > 0) || Configure::read('Asset.timestamp') === 'force')) {
+			if (strpos($url, '?') === false && $timestampEnabled) {
 				$url = $this->webroot($url) . '?' . @filemtime(WWW_ROOT . str_replace('/', DS, $url));
 			} else {
 				$url = $this->webroot($url);
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
index 3b41dd1bc..fd822a511 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -284,6 +284,15 @@ function testImageTag() {
 
 		$result = $this->Html->image('cake.icon.gif');
 		$this->assertTags($result, array('img' => array('src' => 'preg:/img\/cake\.icon\.gif\?\d+/', 'alt' => '')));
+
+		$webroot = $this->Html->webroot;
+		$this->Html->webroot = '/testing/longer/';
+		$result = $this->Html->image('cake.icon.gif');
+		$expected = array(
+			'img' => array('src' => 'preg:/\/testing\/longer\/img\/cake\.icon\.gif\?[0-9]+/', 'alt' => '')
+		);
+		$this->assertTags($result, $expected);
+		$this->Html->webroot = $webroot;
 	}
 /**
  * Tests creation of an image tag using a theme and asset timestamping

From cd640437022d9ab876fb364e3b0cff9b1b1650ac Mon Sep 17 00:00:00 2001
From: jperras <joel.perras@gmail.com>
Date: Tue, 22 Sep 2009 23:10:35 -0400
Subject: [PATCH 013/244] Adding the 'client' option to the doc block for the
 email component smtp options. Fixes #111.

---
 cake/libs/controller/components/email.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index b2e2ea428..55b843958 100644
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -206,6 +206,7 @@ class EmailComponent extends Object{
  * - timeout
  * - username
  * - password
+ * - client
  *
  * @var array
  * @access public

From 6946bb029584f9352690a065416836972561907a Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 23 Sep 2009 23:05:08 -0400
Subject: [PATCH 014/244] Updating docs for FormHelper::inputs() Fixes #110

---
 cake/libs/view/helpers/form.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 1bbca6995..0a58cea16 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -474,13 +474,24 @@ function label($fieldName = null, $text = null, $attributes = array()) {
 		));
 	}
 /**
- * Will display all the fields passed in an array expects fieldName as an array key
- * replaces generateFields
+ * Generate a set of inputs for `$fields`.  If $fields is null the current model
+ * will be used.
  *
+ * In addition to controller fields output, `$fields` can be used to control legend
+ * and fieldset rendering with the `fieldset` and `legend` keys. 
+ * `$form->inputs(array('legend' => 'My legend'));` Would generate an input set with 
+ * a custom legend.  You can customize individual inputs through `$fields` as well.
+ * 
+ * {{{
+ *	$form->inputs(array(
+ *		'name' => array('label' => 'custom label')
+ *	));
+ * }}}
+ *
+ * @param mixed $fields An array of fields to generate inputs for, or null.
+ * @param array $blacklist a simple array of fields to skip.
+ * @return string Completed form inputs.
  * @access public
- * @param array $fields works well with Controller::generateFields() or on its own;
- * @param array $blacklist a simple array of fields to skip
- * @return output
  */
 	function inputs($fields = null, $blacklist = null) {
 		$fieldset = $legend = true;

From 34deb2a18df1cf15c1b120333d47070c850db3fd Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 23 Sep 2009 23:16:57 -0400
Subject: [PATCH 015/244] Correcting omission of group in DboOracle. Fixes #98

---
 cake/libs/model/datasources/dbo/dbo_oracle.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
index 4aa25a6a5..a71a4b1e2 100644
--- a/cake/libs/model/datasources/dbo/dbo_oracle.php
+++ b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -905,7 +905,7 @@ function renderStatement($type, $data) {
 
 		switch (strtolower($type)) {
 			case 'select':
-				return "SELECT {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$order} {$limit}";
+				return "SELECT {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order} {$limit}";
 			break;
 			case 'create':
 				return "INSERT INTO {$table} ({$fields}) VALUES ({$values})";

From 4bf5244073ec81c509311cd15a6e668d7dfaa436 Mon Sep 17 00:00:00 2001
From: jperras <joel.perras@gmail.com>
Date: Thu, 24 Sep 2009 16:23:24 -0400
Subject: [PATCH 016/244] Adding tests for ConnectionManager, and fixing a
 missing return value for ConnectionManager::loadDataSource().

---
 cake/libs/model/connection_manager.php        |   2 +
 .../libs/model/connection_manager.test.php    | 180 ++++++++++++++++++
 2 files changed, 182 insertions(+)
 create mode 100644 cake/tests/cases/libs/model/connection_manager.test.php

diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php
index 32f169840..575348822 100644
--- a/cake/libs/model/connection_manager.php
+++ b/cake/libs/model/connection_manager.php
@@ -179,6 +179,8 @@ function loadDataSource($connName) {
 			trigger_error(sprintf($error, $conn['filename']), E_USER_ERROR);
 			return null;
 		}
+
+		return true;
 	}
 /**
  * Gets a list of class and file names associated with the user-defined DataSource connections
diff --git a/cake/tests/cases/libs/model/connection_manager.test.php b/cake/tests/cases/libs/model/connection_manager.test.php
new file mode 100644
index 000000000..4bc226854
--- /dev/null
+++ b/cake/tests/cases/libs/model/connection_manager.test.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+ * Connection Manager tests
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5550
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'ConnectionManager');
+
+/**
+ * ConnectionManagerTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.models
+ */
+class ConnectionManagerTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->ConnectionManager = ConnectionManager::getInstance();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->ConnectionManager);
+	}
+
+/**
+ * testInstantiation method
+ *
+ * @access public
+ * @return void
+ */
+	function testInstantiation() {
+		$this->assertTrue(is_a($this->ConnectionManager, 'ConnectionManager'));
+	}
+
+/**
+ * testEnumConnectionObjects method
+ *
+ * @access public
+ * @return void
+ */
+	function testEnumConnectionObjects() {
+		$sources = ConnectionManager::enumConnectionObjects();
+		$this->assertTrue(count($sources) >= 1);
+
+		$connections = array('default', 'test', 'test_suite');
+		$this->assertTrue(count(array_intersect(array_keys($sources), $connections)) >= 1);
+	}
+
+/**
+ * testGetDataSource method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetDataSource() {
+		$connections = ConnectionManager::enumConnectionObjects();
+		$this->assertTrue(count(array_keys($connections) >= 1));
+
+		$source = ConnectionManager::getDataSource(key($connections));
+		$this->assertTrue(is_object($source));
+
+	}
+
+/**
+ * testSourceList method
+ *
+ * @access public
+ * @return void
+ */
+	function testSourceList() {
+		$sources = ConnectionManager::sourceList();
+		$this->assertTrue(count($sources) >= 1);
+
+		$connections = array('default', 'test', 'test_suite');
+		$this->assertTrue(count(array_intersect($sources, $connections)) >= 1);
+	}
+
+/**
+ * testGetSourceName method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetSourceName() {
+		$connections = ConnectionManager::enumConnectionObjects();
+		$name = key($connections);
+		$source = ConnectionManager::getDataSource($name);
+		$result = ConnectionManager::getSourceName($source);
+
+		$this->assertEqual($result, $name);
+	}
+
+/**
+ * testLoadDataSource method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadDataSource() {
+		$connections = array(
+			array('classname' => 'DboMysql', 'filename' => 'dbo' . DS . 'dbo_mysql'),
+			array('classname' => 'DboMysqli', 'filename' => 'dbo' . DS . 'dbo_mysqli'),
+			array('classname' => 'DboMssql', 'filename' => 'dbo' . DS . 'dbo_mssql'),
+			array('classname' => 'DboOracle', 'filename' => 'dbo' . DS . 'dbo_oracle'),
+		);
+
+		foreach ($connections as $connection) {
+			$exists = class_exists($connection['classname']);
+			$loaded = ConnectionManager::loadDataSource($connection);
+			$this->assertEqual($loaded, !$exists, "%s Failed loading the {$connection['classname']} datasource");
+		}
+
+		$connection = array('classname' => 'NonExistentDataSource', 'filename' => 'non_existent');
+		$this->expectError(new PatternExpectation('/Unable to load DataSource file/i'));
+
+		$loaded = ConnectionManager::loadDataSource($connection);
+		$this->assertEqual($loaded, null);
+	}
+
+/**
+ * testCreateDataSource method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreateDataSourceWithIntegrationTests() {
+		$name = 'test_created_connection';
+
+		$connections = ConnectionManager::enumConnectionObjects();
+		$this->assertTrue(count(array_keys($connections) >= 1));
+
+		$source = ConnectionManager::getDataSource(key($connections));
+		$this->assertTrue(is_object($source));
+
+		$config = $source->config;
+		$connection = ConnectionManager::create($name, $config);
+
+		$this->assertTrue(is_object($connection));
+		$this->assertEqual($name, $connection->configKeyName);
+		$this->assertEqual($name, ConnectionManager::getSourceName($connection));
+
+		$source = ConnectionManager::create(null, array());
+		$this->assertEqual($source, null);
+
+		$source = ConnectionManager::create('another_test', array());
+		$this->assertEqual($source, null);
+
+		$config = array('classname' => 'DboMysql', 'filename' => 'dbo' . DS . 'dbo_mysql');
+		$source = ConnectionManager::create(null, $config);
+		$this->assertEqual($source, null);
+	}
+}
+?>
\ No newline at end of file

From eb43faf7ccfdc55dc7e14beb63c894f6a3fd275c Mon Sep 17 00:00:00 2001
From: jperras <joel.perras@gmail.com>
Date: Thu, 24 Sep 2009 16:29:35 -0400
Subject: [PATCH 017/244] Adding connection manager tests to database group
 test.

---
 cake/tests/groups/database.group.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/tests/groups/database.group.php b/cake/tests/groups/database.group.php
index 2ecf3b64d..b3ffa3e81 100644
--- a/cake/tests/groups/database.group.php
+++ b/cake/tests/groups/database.group.php
@@ -50,6 +50,7 @@ class DatabaseGroupTest extends GroupTest {
 	function DatabaseGroupTest() {
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'db_acl');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'schema');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'connection_manager');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'datasources' . DS . 'dbo_source');
 	}
 }

From e030400f8e56255678bf57ecc46d40fe056ff002 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 24 Sep 2009 22:26:55 -0400
Subject: [PATCH 018/244] Updating links in home.ctp to point a new address for
 changelogs and to code.cakephp.org instead of trac.

---
 cake/libs/view/pages/home.ctp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp
index f0e3d9c63..46af7f332 100644
--- a/cake/libs/view/pages/home.ctp
+++ b/cake/libs/view/pages/home.ctp
@@ -26,7 +26,7 @@ if (Configure::read() == 0):
 endif;
 ?>
 <h2><?php echo sprintf(__('Release Notes for CakePHP %s.', true), Configure::version()); ?></h2>
-<a href="https://trac.cakephp.org/wiki/changelog/1.2.x.x"><?php __('Read the changelog'); ?> </a>
+<a href="http://code.cakephp.org/wiki/changelog/1_2_x_x"><?php __('Read the changelog'); ?> </a>
 <?php
 if (Configure::read() > 0):
 	Debugger::checkSessionKey();
@@ -136,8 +136,8 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
 	<ul><li><?php __('Community mailing list'); ?></li></ul></li>
 	<li><a href="irc://irc.freenode.net/cakephp">irc.freenode.net #cakephp</a>
 	<ul><li><?php __('Live chat about CakePHP'); ?></li></ul></li>
-	<li><a href="https://trac.cakephp.org/"><?php __('CakePHP Trac'); ?> </a>
-	<ul><li><?php __('For the Development of CakePHP (Tickets, SVN browser, Roadmap, Changelogs)'); ?></li></ul></li>
+	<li><a href="https://code.cakephp.org/"><?php __('CakePHP Code'); ?> </a>
+	<ul><li><?php __('For the Development of CakePHP (Tickets, Git browser, Roadmap, Changelogs)'); ?></li></ul></li>
 	<li><a href="http://www.cakeforge.org"><?php __('CakeForge'); ?> </a>
 	<ul><li><?php __('Open Development for CakePHP'); ?></li></ul></li>
 	<li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php __('Book Store'); ?> </a>

From 06cf97459a5fbe82f66d191bf4ce192866bab548 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 24 Sep 2009 22:43:31 -0400
Subject: [PATCH 019/244] Fixing XmlHelper::elem() when value is null and cdata
 = true.  Removing empty invalid tag. Test cases added. Fixes #127

---
 cake/libs/view/helpers/xml.php                  | 2 +-
 cake/tests/cases/libs/view/helpers/xml.test.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/xml.php b/cake/libs/view/helpers/xml.php
index 6377a5260..53fd1382c 100644
--- a/cake/libs/view/helpers/xml.php
+++ b/cake/libs/view/helpers/xml.php
@@ -112,7 +112,7 @@ function elem($name, $attrib = array(), $content = null, $endTag = true) {
 			$cdata = true;
 			unset($content['cdata']);
 		}
-		if (is_array($content) && isset($content['value'])) {
+		if (is_array($content) && array_key_exists('value', $content)) {
 			$content = $content['value'];
 		}
 		$children = array();
diff --git a/cake/tests/cases/libs/view/helpers/xml.test.php b/cake/tests/cases/libs/view/helpers/xml.test.php
index c7b1bae73..3be7a729c 100644
--- a/cake/tests/cases/libs/view/helpers/xml.test.php
+++ b/cake/tests/cases/libs/view/helpers/xml.test.php
@@ -131,6 +131,10 @@ function testRenderZeroElement() {
 		$result = $this->Xml->elem('count', null, 0);
 		$expected = '<count>0</count>';
 		$this->assertEqual($result, $expected);
+
+		$result = $this->Xml->elem('count', null, array('cdata' => true, 'value' => null));
+		$expected = '<count />';
+		$this->assertEqual($result, $expected);
 	}
 /**
  * testRenderElementWithNamespace method

From 508d737b6aecc8a53e078511e42d4b58d8a553c5 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 26 Sep 2009 14:22:12 -0400
Subject: [PATCH 020/244] Updating HtmlHelper::css, JavascriptHelper::link to
 not replace multiple occurences of CSS_URL or JS_URL when using Asset.filter
 settings. Test cases added. Thanks to 'robustsolution' for the patch. Fixes
 #105

---
 cake/libs/view/helpers/html.php               |  7 ++-
 cake/libs/view/helpers/javascript.php         |  7 ++-
 .../cases/libs/view/helpers/html.test.php     | 46 ++++++++++++++-----
 .../libs/view/helpers/javascript.test.php     |  4 ++
 4 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index b6b0fdd0e..ee209e1bf 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -352,13 +352,16 @@ function css($path, $rel = null, $htmlAttributes = array(), $inline = true) {
 				(Configure::read('Asset.timestamp') === true && Configure::read() > 0) ||
 				Configure::read('Asset.timestamp') === 'force'
 			);
+
 			$url = $this->webroot($path);
 			if (strpos($path, '?') === false && $timestampEnabled) {
 				$url .= '?' . @filemtime(WWW_ROOT . str_replace('/', DS, $path));
 			}
-
 			if (Configure::read('Asset.filter.css')) {
-				$url = str_replace(CSS_URL, 'ccss/', $url);
+				$pos = strpos($url, CSS_URL);
+				if ($pos !== false) {
+					$url = substr($url, 0, $pos) . 'ccss/' . substr($url, $pos + strlen(CSS_URL));
+				}
 			}
 		}
 
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index 8e9430dd9..330627a9f 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -263,9 +263,12 @@ function link($url, $inline = true) {
 			} else {
 				$url = $this->webroot($url);
 			}
-
+			
 			if (Configure::read('Asset.filter.js')) {
-				$url = str_replace(JS_URL, 'cjs/', $url);
+				$pos = strpos($url, JS_URL);
+				if ($pos !== false) {
+					$url = substr($url, 0, $pos) . 'cjs/' . substr($url, $pos + strlen(JS_URL));
+				}
 			}
 		}
 		$out = $this->output(sprintf($this->tags['javascriptlink'], $url));
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
index fd822a511..ab365a535 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -370,12 +370,6 @@ function testCssLink() {
 		$expected['link']['href'] = 'preg:/http:\/\/.*\/screen\.css\?1234/';
 		$this->assertTags($result, $expected);
 
-		Configure::write('Asset.filter.css', 'css.php');
-		$result = $this->Html->css('cake.generic');
-		$expected['link']['href'] = 'preg:/.*ccss\/cake\.generic\.css/';
-		$this->assertTags($result, $expected);
-		Configure::write('Asset.filter.css', false);
-
 		$result = explode("\n", trim($this->Html->css(array('cake.generic', 'vendor.generic'))));
 		$expected['link']['href'] = 'preg:/.*css\/cake\.generic\.css/';
 		$this->assertTags($result[0], $expected);
@@ -385,12 +379,6 @@ function testCssLink() {
 
 		Configure::write('Asset.timestamp', true);
 
-		Configure::write('Asset.filter.css', 'css.php');
-		$result = $this->Html->css('cake.generic');
-		$expected['link']['href'] = 'preg:/.*ccss\/cake\.generic\.css\?[0-9]+/';
-		$this->assertTags($result, $expected);
-		Configure::write('Asset.filter.css', false);
-
 		$result = $this->Html->css('cake.generic');
 		$expected['link']['href'] = 'preg:/.*css\/cake\.generic\.css\?[0-9]+/';
 		$this->assertTags($result, $expected);
@@ -421,6 +409,40 @@ function testCssLink() {
 		$this->assertTags($result, $expected);
 		$this->Html->webroot = $webroot;
 	}
+/**
+ * test css() with Asset.Css.filter
+ *
+ * @return void
+ **/
+	function testCssFiltering() {
+		$this->Html->webroot = '/';
+
+		Configure::write('Asset.filter.css', 'css.php');
+		$result = $this->Html->css('cake.generic');
+		$expected = array(
+			'link' => array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => 'preg:/\/ccss\/cake\.generic\.css/')
+		);
+		$this->assertTags($result, $expected);
+
+		Configure::write('Asset.timestamp', true);
+		Configure::write('Asset.filter.css', 'css.php');
+
+		$result = $this->Html->css('cake.generic');
+		$expected['link']['href'] = 'preg:/\/ccss\/cake\.generic\.css\?[0-9]+/';
+		$this->assertTags($result, $expected);
+
+		Configure::write('Asset.timestamp', false);
+		$result = $this->Html->css('myfoldercss/cake.generic');
+		$expected['link']['href'] = 'preg:/\/ccss\/myfoldercss\/cake\.generic\.css/';
+		$this->assertTags($result, $expected);
+		
+		$this->Html->webroot = '/testing/longer/';
+		$result = $this->Html->css('myfoldercss/cake.generic');
+		$expected['link']['href'] = 'preg:/\/testing\/longer\/ccss\/myfoldercss\/cake\.generic\.css/';
+		$this->assertTags($result, $expected);
+
+		Configure::write('Asset.filter.css', false);
+	}
 /**
  * testCharsetTag method
  *
diff --git a/cake/tests/cases/libs/view/helpers/javascript.test.php b/cake/tests/cases/libs/view/helpers/javascript.test.php
index 1fdfccf21..5bb4cb713 100644
--- a/cake/tests/cases/libs/view/helpers/javascript.test.php
+++ b/cake/tests/cases/libs/view/helpers/javascript.test.php
@@ -250,6 +250,10 @@ function testFilteringAndTimestamping() {
 		$expected = '<script type="text/javascript" src="cjs/jquery-1.1.2.js"></script>';
 		$this->assertEqual($result, $expected);
 
+		$result = $this->Javascript->link('folderjs/jquery-1.1.2');
+		$expected = '<script type="text/javascript" src="cjs/folderjs/jquery-1.1.2.js"></script>';
+		$this->assertEqual($result, $expected);
+
 		if ($old === null) {
 			Configure::delete('Asset.filter.js');
 		}

From 51508c6375fcab3c1733d5be0cad54bdd6ce82a5 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 28 Sep 2009 18:09:02 -0400
Subject: [PATCH 021/244] Fixing error in php5.3 when calling behavior methods
 that had more than 6 parameters.

---
 cake/libs/model/behavior.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/model/behavior.php b/cake/libs/model/behavior.php
index fdbc64e30..f264397a6 100644
--- a/cake/libs/model/behavior.php
+++ b/cake/libs/model/behavior.php
@@ -167,7 +167,7 @@ function dispatchMethod(&$model, $method, $params = array()) {
 			case 5:
 				return $this->{$method}($model, $params[0], $params[1], $params[2], $params[3], $params[4]);
 			default:
-				array_unshift($params, $model);
+				array_unshift($params, &$model);
 				return call_user_func_array(array(&$this, $method), $params);
 			break;
 		}

From bcb5e42aab686e2fa5cb48ec3745080701df5e00 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 28 Sep 2009 18:11:04 -0400
Subject: [PATCH 022/244] Adding test for previous commit.

---
 cake/tests/cases/libs/model/behavior.test.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cake/tests/cases/libs/model/behavior.test.php b/cake/tests/cases/libs/model/behavior.test.php
index 727316a22..49b53cd2a 100644
--- a/cake/tests/cases/libs/model/behavior.test.php
+++ b/cake/tests/cases/libs/model/behavior.test.php
@@ -975,6 +975,8 @@ function testBehaviorMethodDispatchingWithData() {
 		$Apple->set('field', 'value');
 		$this->assertTrue($Apple->testData());
 		$this->assertTrue($Apple->data['Apple']['field_2']);
+
+		$this->assertTrue($Apple->testData('one', 'two', 'three', 'four', 'five', 'six'));
 	}
 /**
  * testBehaviorTrigger method

From 778a6b93039f1fa667fab5f1ccfaf82ecd95a344 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 29 Sep 2009 10:05:03 -0400
Subject: [PATCH 023/244] Reversing change from
 [a37fc0d455e373b30a73f11687885572c6e4b90d].  As the additional & causes
 errors in PHP <= 5.2

---
 cake/libs/model/behavior.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/model/behavior.php b/cake/libs/model/behavior.php
index f264397a6..fdbc64e30 100644
--- a/cake/libs/model/behavior.php
+++ b/cake/libs/model/behavior.php
@@ -167,7 +167,7 @@ function dispatchMethod(&$model, $method, $params = array()) {
 			case 5:
 				return $this->{$method}($model, $params[0], $params[1], $params[2], $params[3], $params[4]);
 			default:
-				array_unshift($params, &$model);
+				array_unshift($params, $model);
 				return call_user_func_array(array(&$this, $method), $params);
 			break;
 		}

From dc220bbb2147139ee44e45af016315be220086fd Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 29 Sep 2009 20:43:17 -0400
Subject: [PATCH 024/244] Fixing DboSybase::connect() to use port configuration
 value. Thanks 'tPl0ch' for the various attempts :) Fixes #90

---
 cake/libs/model/datasources/dbo/dbo_sybase.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_sybase.php b/cake/libs/model/datasources/dbo/dbo_sybase.php
index 2c154ef21..7d52552d3 100644
--- a/cake/libs/model/datasources/dbo/dbo_sybase.php
+++ b/cake/libs/model/datasources/dbo/dbo_sybase.php
@@ -89,17 +89,17 @@ class DboSybase extends DboSource {
  */
 	function connect() {
 		$config = $this->config;
-		$this->connected = false;
 
-		if (!$config['persistent']) {
-			$this->connection = sybase_connect($config['host'], $config['login'], $config['password'], true);
-		} else {
-			$this->connection = sybase_pconnect($config['host'], $config['login'], $config['password']);
+		$port = '';
+		if ($config['port'] !== null) {
+			$port = ':' . $config['port'];
 		}
-
-		if (sybase_select_db($config['database'], $this->connection)) {
-			$this->connected = true;
+		if ($config['persistent']) {
+			$this->connection = sybase_connect($config['host'] . $port, $config['login'], $config['password'], true);
+		} else {
+			$this->connection = sybase_pconnect($config['host'] . $port, $config['login'], $config['password']);
 		}
+		$this->connected = sybase_select_db($config['database'], $this->connection);
 		return $this->connected;
 	}
 /**

From 6dbba17d1b3a670c8e8a35ea1e28310343bb3db5 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 30 Sep 2009 00:37:06 -0400
Subject: [PATCH 025/244] Fixing issues with DboSource::execute() where queries
 would not be run if stats  = false in the options. Tests added.

---
 cake/libs/model/datasources/dbo_source.php    |  4 ++--
 .../model/datasources/dbo_source.test.php     | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 63d2577fb..1b10243d9 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -184,9 +184,9 @@ function execute($sql, $options = array()) {
 		$defaults = array('stats' => true, 'log' => $this->fullDebug);
 		$options = array_merge($defaults, $options);
 
+		$t = getMicrotime();
+		$this->_result = $this->_execute($sql);
 		if ($options['stats']) {
-			$t = getMicrotime();
-			$this->_result = $this->_execute($sql);
 			$this->took = round((getMicrotime() - $t) * 1000, 0);
 			$this->affected = $this->lastAffected();
 			$this->error = $this->lastError();
diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
index 4da90c9be..00fe40866 100644
--- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -3799,6 +3799,27 @@ function testLog() {
 		$this->testDb->error = $oldError;
 		Configure::write('debug', $oldDebug);
 	}
+/**
+ * test that execute runs queries.
+ *
+ * @return void
+ **/
+	function testExecute() {
+		$query = 'SELECT * FROM ' . $this->testDb->fullTableName('articles') . ' WHERE 1 = 1';
+
+		$this->db->_result = null;
+		$this->db->took = null;
+		$this->db->affected = null;
+		$result = $this->db->execute($query, array('stats' => false));
+		$this->assertNotNull($result, 'No query performed! %s');
+		$this->assertNull($this->db->took, 'Stats were set %s');
+		$this->assertNull($this->db->affected, 'Stats were set %s');
+
+		$result = $this->db->execute($query);
+		$this->assertNotNull($result, 'No query performed! %s');
+		$this->assertNotNull($this->db->took, 'Stats were not set %s');
+		$this->assertNotNull($this->db->affected, 'Stats were not set %s');
+	}
 /**
  * test ShowQuery generation of regular and error messages
  *

From 5f49a0f25c67df77bea7728a67e3a76679c76e15 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 30 Sep 2009 14:25:56 -0400
Subject: [PATCH 026/244] Updating path handling inside i18n. Removes the extra
 DS that was appended to some paths. Fixes #126

---
 cake/libs/i18n.php                  | 9 ++++++---
 cake/tests/cases/libs/i18n.test.php | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cake/libs/i18n.php b/cake/libs/i18n.php
index 6e21ca5c9..5b2be8db8 100644
--- a/cake/libs/i18n.php
+++ b/cake/libs/i18n.php
@@ -263,7 +263,7 @@ function __bindTextDomain($domain) {
 				$plugin = Inflector::underscore($plugin);
 				if ($plugin === $domain) {
 					foreach ($pluginPaths as $pluginPath) {
-						$searchPaths[] = $pluginPath . DS . $plugin . DS . 'locale';
+						$searchPaths[] = $pluginPath . $plugin . DS . 'locale' . DS;
 					}
 					$searchPaths = array_reverse($searchPaths);
 					break;
@@ -271,12 +271,15 @@ function __bindTextDomain($domain) {
 			}
 		}
 
+
 		foreach ($searchPaths as $directory) {
+
 			foreach ($this->l10n->languagePath as $lang) {
-				$file = $directory . DS . $lang . DS . $this->category . DS . $domain;
+				$file = $directory . $lang . DS . $this->category . DS . $domain;
 
 				if ($core) {
-					$app = $directory . DS . $lang . DS . $this->category . DS . 'core';
+					$app = $directory . $lang . DS . $this->category . DS . 'core';
+
 					if (file_exists($fn = "$app.mo")) {
 						$this->__loadMo($fn, $domain);
 						$this->__noLocale = false;
diff --git a/cake/tests/cases/libs/i18n.test.php b/cake/tests/cases/libs/i18n.test.php
index e570bc6f5..3aa5b2f57 100644
--- a/cake/tests/cases/libs/i18n.test.php
+++ b/cake/tests/cases/libs/i18n.test.php
@@ -43,10 +43,10 @@ function setUp() {
 		Configure::write('__objects', array());
 
 		$this->_localePaths = Configure::read('localePaths');
-		Configure::write('localePaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale'));
+		Configure::write('localePaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale' . DS));
 
 		$this->_pluginPaths = Configure::read('pluginPaths');
-		Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins'));
+		Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
 
 	}
 /**

From 347c175b85f319476ec714441e34ac3a1ecd87b1 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 30 Sep 2009 22:44:15 -0400
Subject: [PATCH 027/244] Updating documentation blocks for CacheHelper.

---
 cake/libs/view/helpers/cache.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php
index d8e60b12f..009286fe6 100644
--- a/cake/libs/view/helpers/cache.php
+++ b/cake/libs/view/helpers/cache.php
@@ -1,9 +1,7 @@
 <?php
 /* SVN FILE: $Id$ */
 /**
- * Short description for file.
- *
- * Long description for file
+ * CacheHelper helps create full page view caching.
  *
  * PHP versions 4 and 5
  *
@@ -25,9 +23,10 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 /**
- * Short description for file.
+ * CacheHelper helps create full page view caching.
  *
- * Long description for file
+ * When using CacheHelper you don't call any of its methods, they are all automatically
+ * called by View, and use the $cacheAction settings set in the controller.
  *
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers

From f12cbdba380479b96bb842c11e6e8f250e584728 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 1 Oct 2009 01:03:47 -0400
Subject: [PATCH 028/244] Fixing CacheHelper and multiple cake:nocache tags in
 a view file, breaking cake:nocache following $content_for_layout. Fixes #136

---
 cake/libs/view/helpers/cache.php              | 27 ++++++++++--------
 .../cases/libs/view/helpers/cache.test.php    | 28 +++++++++++++++++++
 .../test_app/views/posts/multiple_nocache.ctp | 15 ++++++++++
 3 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 cake/tests/test_app/views/posts/multiple_nocache.ctp

diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php
index 009286fe6..afbf0ce57 100644
--- a/cake/libs/view/helpers/cache.php
+++ b/cake/libs/view/helpers/cache.php
@@ -156,27 +156,30 @@ function __parseFile($file, $cache) {
 		} elseif ($file = fileExistsInPath($file)) {
 			$file = file_get_contents($file);
 		}
-
-		preg_match_all('/(<cake:nocache>(?<=<cake:nocache>)[\\s\\S]*?(?=<\/cake:nocache>)<\/cake:nocache>)/i', $cache, $oresult, PREG_PATTERN_ORDER);
-		preg_match_all('/(?<=<cake:nocache>)([\\s\\S]*?)(?=<\/cake:nocache>)/i', $file, $result, PREG_PATTERN_ORDER);
+		preg_match_all('/(<cake:nocache>(?<=<cake:nocache>)[\\s\\S]*?(?=<\/cake:nocache>)<\/cake:nocache>)/i', $cache, $outputResult, PREG_PATTERN_ORDER);
+		preg_match_all('/(?<=<cake:nocache>)([\\s\\S]*?)(?=<\/cake:nocache>)/i', $file, $fileResult, PREG_PATTERN_ORDER);
+		$fileResult = $fileResult[0];
+		$outputResult = $outputResult[0];
 
 		if (!empty($this->__replace)) {
-			foreach ($oresult['0'] as $k => $element) {
+			foreach ($outputResult as $i => $element) {
 				$index = array_search($element, $this->__match);
 				if ($index !== false) {
-					array_splice($oresult[0], $k, 1);
+					unset($outputResult[$i]);
 				}
 			}
+			$outputResult = array_values($outputResult);
 		}
 
-		if (!empty($result['0'])) {
-			$count = 0;
-			foreach ($result['0'] as $block) {
-				if (isset($oresult['0'][$count])) {
-					$this->__replace[] = $block;
-					$this->__match[] = $oresult['0'][$count];
+
+		if (!empty($fileResult)) {
+			$i = 0;
+			foreach ($fileResult as $cacheBlock) {
+				if (isset($outputResult[$i])) {
+					$this->__replace[] = $cacheBlock;
+					$this->__match[] = $outputResult[$i];
 				}
-				$count++;
+				$i++;
 			}
 		}
 	}
diff --git a/cake/tests/cases/libs/view/helpers/cache.test.php b/cake/tests/cases/libs/view/helpers/cache.test.php
index f6e9b081e..fc450ecc9 100644
--- a/cake/tests/cases/libs/view/helpers/cache.test.php
+++ b/cake/tests/cases/libs/view/helpers/cache.test.php
@@ -62,6 +62,8 @@ function cache_parsing() {
 		$this->layout = 'cache_layout';
 		$this->set('variable', 'variableValue');
 		$this->set('superman', 'clark kent');
+		$this->set('batman', 'bruce wayne');
+		$this->set('spiderman', 'peter parker');
 	}
 }
 /**
@@ -162,7 +164,33 @@ function testLayoutCacheParsingWithTagsInView() {
 		$this->assertPattern('/if \(is_writable\(TMP\)\)\:/', $contents);
 		$this->assertPattern('/php echo \$variable/', $contents);
 		$this->assertPattern('/php echo microtime()/', $contents);
+		$this->assertNoPattern('/cake:nocache/', $contents);
+
+		@unlink($filename);
+	}
+
+/**
+ * test that multiple <cake:nocache> tags function with multiple nocache tags in the layout.
+ *
+ * @return void
+ **/
+	function testMultipleNoCacheTagsInViewfile() {
+		$this->Controller->cache_parsing();
+		$this->Controller->cacheAction = 21600;
+		$this->Controller->here = '/cacheTest/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('multiple_nocache');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
 
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_parsing.php';
+		$this->assertTrue(file_exists($filename));
+
+		$contents = file_get_contents($filename);
+		$this->assertNoPattern('/cake:nocache/', $contents);
 		@unlink($filename);
 	}
 /**
diff --git a/cake/tests/test_app/views/posts/multiple_nocache.ctp b/cake/tests/test_app/views/posts/multiple_nocache.ctp
new file mode 100644
index 000000000..eb397e492
--- /dev/null
+++ b/cake/tests/test_app/views/posts/multiple_nocache.ctp
@@ -0,0 +1,15 @@
+--view start--
+<cake:nocache>
+	<?php echo $batman ?>
+</cake:nocache>
+
+this view has 3 nocache blocks
+
+<cake:nocache>
+	<?php echo $spiderman; ?>
+</cake:nocache>
+
+<cake:nocache>
+	<?php echo 'some string'; ?>
+</cake:nocache>
+--view end--
\ No newline at end of file

From c47e899ba1c62223a31746e44932fec0f7a7935a Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 2 Oct 2009 12:53:20 -0400
Subject: [PATCH 029/244] Fixing HtmlHelper::css, and JavascriptHelper::link so
 that files containing the asset extension always get the extension added.
 Test cases added. Refs #139

---
 cake/libs/view/helpers/html.php                        | 2 +-
 cake/libs/view/helpers/javascript.php                  | 2 +-
 cake/tests/cases/libs/view/helpers/html.test.php       | 4 ++++
 cake/tests/cases/libs/view/helpers/javascript.test.php | 4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index ee209e1bf..8ef8406ec 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -344,7 +344,7 @@ function css($path, $rel = null, $htmlAttributes = array(), $inline = true) {
 			}
 
 			if (strpos($path, '?') === false) {
-				if (strpos($path, '.css') === false) {
+				if (substr($path, -4) !== '.css') {
 					$path .= '.css';
 				}
 			}
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index 330627a9f..21eab7f44 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -249,7 +249,7 @@ function link($url, $inline = true) {
 				$url = JS_URL . $url;
 			}
 			if (strpos($url, '?') === false) {
-				if (strpos($url, '.js') === false) {
+				if (substr($url, -3) !== '.js') {
 					$url .= '.js';
 				}
 			}
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
index ab365a535..635e908bf 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -362,6 +362,10 @@ function testCssLink() {
 		$result = $this->Html->css('screen.css');
 		$this->assertTags($result, $expected);
 
+		$result = $this->Html->css('my.css.library');
+		$expected['link']['href'] = 'preg:/.*css\/my\.css\.library\.css/';
+		$this->assertTags($result, $expected);
+
 		$result = $this->Html->css('screen.css?1234');
 		$expected['link']['href'] = 'preg:/.*css\/screen\.css\?1234/';
 		$this->assertTags($result, $expected);
diff --git a/cake/tests/cases/libs/view/helpers/javascript.test.php b/cake/tests/cases/libs/view/helpers/javascript.test.php
index 5bb4cb713..fceb01343 100644
--- a/cake/tests/cases/libs/view/helpers/javascript.test.php
+++ b/cake/tests/cases/libs/view/helpers/javascript.test.php
@@ -166,6 +166,10 @@ function testLink() {
 		$expected = '<script type="text/javascript" src="js/scriptaculous.js?load=effects"></script>';
 		$this->assertEqual($result, $expected);
 
+		$result = $this->Javascript->link('some.json.libary');
+		$expected = '<script type="text/javascript" src="js/some.json.libary.js"></script>';
+		$this->assertEqual($result, $expected);
+
 		$result = $this->Javascript->link('jquery-1.1.2');
 		$expected = '<script type="text/javascript" src="js/jquery-1.1.2.js"></script>';
 		$this->assertEqual($result, $expected);

From 3bf94e6a2867f24bf04f6dc9431b586510e15119 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 3 Sep 2009 11:59:57 -0400
Subject: [PATCH 030/244] Updating documentation for Model methods to improve
 api parsing. Removing redundant include.

---
 cake/libs/model/model.php                     | 31 ++++++++++---------
 .../cases/libs/model/model_read.test.php      |  1 -
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index d437edf8e..5aacbee6f 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -453,7 +453,7 @@ function call__($method, $params) {
  *
  * @param mixed $model A model or association name (string) or set of binding options (indexed by model name type)
  * @param array $options If $model is a string, this is the list of association properties with which $model will
- * 						 be bound
+ *    be bound
  * @param boolean $permanent Set to true to make the binding permanent
  * @return void
  * @access public
@@ -1114,8 +1114,8 @@ function saveField($name, $value, $validate = false) {
  *
  * @param array $data Data to save.
  * @param mixed $validate Either a boolean, or an array.
- * 			If a boolean, indicates whether or not to validate before saving.
- *			If an array, allows control of validate, callbacks, and fieldList
+ *   If a boolean, indicates whether or not to validate before saving.
+ *   If an array, allows control of validate, callbacks, and fieldList
  * @param array $fieldList List of fields to allow to be written
  * @return mixed On success Model::$data if its not empty or true, false on failure
  * @access public
@@ -1459,17 +1459,20 @@ function _prepareUpdateFields($data) {
  * Saves multiple individual records for a single model; Also works with a single record, as well as
  * all its associated records.
  *
+ * #### Options
+ *
+ * - validate: Set to false to disable validation, true to validate each record before
+ *   saving, 'first' to validate *all* records before any are saved, or 'only' to only
+ *   validate the records, but not save them.
+ * - atomic: If true (default), will attempt to save all records in a single transaction.
+ *   Should be set to false if database/table does not support transactions.
+ *   If false, we return an array similar to the $data array passed, but values are set to true/false
+ *   depending on whether each record saved successfully.
+ * - fieldList: Equivalent to the $fieldList parameter in Model::save()
+ *
  * @param array $data Record data to save.  This can be either a numerically-indexed array (for saving multiple
- * 						records of the same type), or an array indexed by association name.
- * @param array $options Options to use when saving record data, which are as follows:
- * 							- validate: Set to false to disable validation, true to validate each record before
- * 							  saving, 'first' to validate *all* records before any are saved, or 'only' to only
- * 							  validate the records, but not save them.
- * 							- atomic: If true (default), will attempt to save all records in a single transaction.
- *							  Should be set to false if database/table does not support transactions.
- *								If false, we return an array similar to the $data array passed, but values are set to true/false
- *								depending on whether each record saved successfully.
- *							- fieldList: Equivalent to the $fieldList parameter in Model::save()
+ *     records of the same type), or an array indexed by association name.
+ * @param array $options Options to use when saving record data, See $options above.
  * @return mixed True on success, or false on failure
  * @access public
  * @link http://book.cakephp.org/view/84/Saving-Related-Model-Data-hasOne-hasMany-belongsTo
@@ -1664,7 +1667,7 @@ function __save($data, $options) {
  * Updates multiple model records based on a set of conditions.
  *
  * @param array $fields Set of fields and values, indexed by fields.
- * 						Fields are treated as SQL snippets, to insert literal values manually escape your data.
+ *    Fields are treated as SQL snippets, to insert literal values manually escape your data.
  * @param mixed $conditions Conditions to match, true for all records
  * @return boolean True on success, false on failure
  * @access public
diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php
index a2fd76f82..eec0cfe70 100644
--- a/cake/tests/cases/libs/model/model_read.test.php
+++ b/cake/tests/cases/libs/model/model_read.test.php
@@ -25,7 +25,6 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 require_once dirname(__FILE__) . DS . 'model.test.php';
-require_once dirname(__FILE__) . DS . 'model_read.test.php';
 /**
  * ModelReadTest
  *

From 51e471427a8480f6858dd5fce3c5500254627004 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 5 Oct 2009 21:01:31 -0400
Subject: [PATCH 031/244] Updating doc blocks to improve parsing in the API.

---
 cake/libs/model/behaviors/containable.php |  4 +++-
 cake/libs/model/model.php                 | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php
index a602efff3..ed5dd6d5d 100644
--- a/cake/libs/model/behaviors/containable.php
+++ b/cake/libs/model/behaviors/containable.php
@@ -77,8 +77,9 @@ function setup(&$Model, $settings = array()) {
  * Runs before a find() operation. Used to allow 'contain' setting
  * as part of the find call, like this:
  *
- * Model->find('all', array('contain' => array('Model1', 'Model2')));
+ * `Model->find('all', array('contain' => array('Model1', 'Model2')));`
  *
+ * {{{
  * Model->find('all', array('contain' => array(
  * 	'Model1' => array('Model11', 'Model12'),
  * 	'Model2',
@@ -87,6 +88,7 @@ function setup(&$Model, $settings = array()) {
  * 		'Model32',
  * 		'Model33' => array('Model331', 'Model332')
  * )));
+ * }}}
  *
  * @param object $Model	Model using the behavior
  * @param array $query Query parameters as set by cake
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index d437edf8e..3f0cc4d7e 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -453,7 +453,7 @@ function call__($method, $params) {
  *
  * @param mixed $model A model or association name (string) or set of binding options (indexed by model name type)
  * @param array $options If $model is a string, this is the list of association properties with which $model will
- * 						 be bound
+ *   be bound
  * @param boolean $permanent Set to true to make the binding permanent
  * @return void
  * @access public
@@ -1909,14 +1909,19 @@ function hasAny($conditions = null) {
  * second parameter options for finding ( indexed array, including: 'conditions', 'limit',
  * 'recursive', 'page', 'fields', 'offset', 'order')
  *
- * Eg: find('all', array(
- * 					'conditions' => array('name' => 'Thomas Anderson'),
- * 					'fields' => array('name', 'email'),
- * 					'order' => 'field3 DESC',
- * 					'recursive' => 2,
- * 					'group' => 'type'));
+ * Eg: 
+ * {{{
+ *	find('all', array(
+ *		'conditions' => array('name' => 'Thomas Anderson'),
+ * 		'fields' => array('name', 'email'),
+ * 		'order' => 'field3 DESC',
+ * 		'recursive' => 2,
+ * 		'group' => 'type'
+ * ));
+ * }}}
  *
  * Specifying 'fields' for new-notation 'list':
+ *
  *  - If no fields are specified, then 'id' is used for key and 'model->displayField' is used for value.
  *  - If a single field is specified, 'id' is used for key and specified field is used for value.
  *  - If three fields are specified, they are used (in order) for key, value and group.

From 2d2e692b37ed060d10edf613074966813b7e9fff Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 5 Oct 2009 21:27:34 -0400
Subject: [PATCH 032/244] Updating doc blocks to improve API parsing.

---
 cake/libs/model/model.php |  8 +++++---
 cake/libs/set.php         | 14 +++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 9be83a6ab..341d60c2b 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -757,10 +757,12 @@ function setSource($tableName) {
 		$this->schema();
 	}
 /**
- * This function does two things: 1) it scans the array $one for the primary key,
+ * This function does two things: 
+ *
+ * 1. it scans the array $one for the primary key,
  * and if that's found, it sets the current id to the value of $one[id].
  * For all other keys than 'id' the keys and values of $one are copied to the 'data' property of this object.
- * 2) Returns an array with all of $one's keys and values.
+ * 2. Returns an array with all of $one's keys and values.
  * (Alternative indata: two strings, which are mangled to
  * a one-item, two-dimensional array using $one for a key and $two as its value.)
  *
@@ -1377,7 +1379,7 @@ function __saveMulti($joined, $id) {
  *
  * @param array $keys Optional foreign key data, defaults to the information $this->data
  * @param boolean $created True if a new record was created, otherwise only associations with
- *				  'counterScope' defined get updated
+ *   'counterScope' defined get updated
  * @return void
  * @access public
  */
diff --git a/cake/libs/set.php b/cake/libs/set.php
index 2afb7156d..230e22fad 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -340,9 +340,11 @@ function format($data, $format, $keys) {
 		return $out;
 	}
 /**
- * Implements partial support for XPath 2.0. If $path is an array or $data is empty it the call is delegated to Set::classicExtract.
+ * Implements partial support for XPath 2.0. If $path is an array or $data is empty it the call 
+ * is delegated to Set::classicExtract.
+ *
+ * #### Currently implemented selectors:
  *
- * Currently implemented selectors:
  * - /User/id (similar to the classic {n}.User.id)
  * - /User[2]/name (selects the name of the second User)
  * - /User[id>2] (selects all Users with an id > 2)
@@ -355,11 +357,13 @@ function format($data, $format, $keys) {
  * - /Comment[text=/cakephp/i] (Selects the all comments that have a text matching the regex /cakephp/i)
  * - /Comment/@* (Selects the all key names of all comments)
  *
- * Other limitations:
+ * #### Other limitations:
+ *
  * - Only absolute paths starting with a single '/' are supported right now
  *
- * Warning: Even so it has plenty of unit tests the XPath support has not gone through a lot of real-world testing. Please report
- * Bugs as you find them. Suggestions for additional features to imlement are also very welcome!
+ * **Warning**: Even so it has plenty of unit tests the XPath support has not gone through a lot of 
+ * real-world testing. Please report Bugs as you find them. Suggestions for additional features to 
+ * implement are also very welcome!
  *
  * @param string $path An absolute XPath 2.0 path
  * @param string $data An array of data to extract from

From 6e9ca4367e401ba88b8a5d3eb8a0a289dd7370b6 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 6 Oct 2009 09:21:43 -0400
Subject: [PATCH 033/244] Fixing connection methods in DboSybase. Fixes #145

---
 cake/libs/model/datasources/dbo/dbo_sybase.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_sybase.php b/cake/libs/model/datasources/dbo/dbo_sybase.php
index 7d52552d3..4bed00e43 100644
--- a/cake/libs/model/datasources/dbo/dbo_sybase.php
+++ b/cake/libs/model/datasources/dbo/dbo_sybase.php
@@ -95,9 +95,9 @@ function connect() {
 			$port = ':' . $config['port'];
 		}
 		if ($config['persistent']) {
-			$this->connection = sybase_connect($config['host'] . $port, $config['login'], $config['password'], true);
-		} else {
 			$this->connection = sybase_pconnect($config['host'] . $port, $config['login'], $config['password']);
+		} else {
+			$this->connection = sybase_connect($config['host'] . $port, $config['login'], $config['password'], true);
 		}
 		$this->connected = sybase_select_db($config['database'], $this->connection);
 		return $this->connected;

From e04cc816137ea216f90d569ac86a480c7262900b Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 12 Oct 2009 23:38:55 -0400
Subject: [PATCH 034/244] Updating doc block. Removing redundant condition.

---
 cake/libs/model/model.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 341d60c2b..abf93d39c 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -985,11 +985,11 @@ function hasField($name) {
 	}
 /**
  * Initializes the model for writing a new record, loading the default values
- * for those fields that are not defined in $data. Especially helpful for
- * saving data in loops.
+ * for those fields that are not defined in $data, and clearing previous validation errors. 
+ * Especially helpful for saving data in loops.
  *
  * @param mixed $data Optional data array to assign to the model after it is created.  If null or false,
- *                    schema data defaults are not merged.
+ *   schema data defaults are not merged.
  * @param boolean $filterKey If true, overwrites any primary key input with an empty value
  * @return array The current Model::data; after merging $data and/or defaults from database
  * @access public
@@ -2656,7 +2656,7 @@ function setDataSource($dataSource = null) {
 			$this->tablePrefix = $db->config['prefix'];
 		}
 
-		if (empty($db) || $db == null || !is_object($db)) {
+		if (empty($db) || !is_object($db)) {
 			return $this->cakeError('missingConnection', array(array('className' => $this->alias)));
 		}
 	}

From e5a99b26852fce13efb33c07db1ea67bae5bf801 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 12 Oct 2009 23:55:40 -0400
Subject: [PATCH 035/244] Updating RequestHandler::renderAs() to respect DS
 constant, fixing issues on PHP4 + Windows. Fixes #97

---
 cake/libs/controller/components/request_handler.php           | 4 ++--
 .../cases/libs/controller/components/request_handler.test.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php
index efca6b2c5..2c61f82b2 100644
--- a/cake/libs/controller/components/request_handler.php
+++ b/cake/libs/controller/components/request_handler.php
@@ -583,9 +583,9 @@ function renderAs(&$controller, $type) {
 		$controller->ext = '.ctp';
 
 		if (empty($this->__renderType)) {
-			$controller->viewPath .= '/' . $type;
+			$controller->viewPath .= DS . $type;
 		} else {
-			$remove = preg_replace("/(?:\/{$this->__renderType})$/", '/' . $type, $controller->viewPath);
+			$remove = preg_replace("/([\/\\\\]{$this->__renderType})$/", DS . $type, $controller->viewPath);
 			$controller->viewPath = $remove;
 		}
 		$this->__renderType = $type;
diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php
index f0e638d4d..7285ba847 100644
--- a/cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/cake/tests/cases/libs/controller/components/request_handler.test.php
@@ -267,13 +267,13 @@ function testRenderAs() {
  **/
 	function testRenderAsCalledTwice() {
 		$this->RequestHandler->renderAs($this->Controller, 'xml');
-		$this->assertEqual($this->Controller->viewPath, 'request_handler_test/xml');
+		$this->assertEqual($this->Controller->viewPath, 'request_handler_test' . DS . 'xml');
 		$this->assertEqual($this->Controller->layoutPath, 'xml');
 		
 		$this->assertTrue(in_array('Xml', $this->Controller->helpers));
 
 		$this->RequestHandler->renderAs($this->Controller, 'js');
-		$this->assertEqual($this->Controller->viewPath, 'request_handler_test/js');
+		$this->assertEqual($this->Controller->viewPath, 'request_handler_test' . DS . 'js');
 		$this->assertEqual($this->Controller->layoutPath, 'js');
 		$this->assertTrue(in_array('Js', $this->Controller->helpers));
 	}

From a4d09a806c4c92905838f0ddade1b857e57369c0 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 13 Oct 2009 00:01:09 -0400
Subject: [PATCH 036/244] Adding tests for previous commit, showing alteration
 of \ into DS.

---
 .../cases/libs/controller/components/request_handler.test.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php
index 7285ba847..e0adee344 100644
--- a/cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/cake/tests/cases/libs/controller/components/request_handler.test.php
@@ -258,6 +258,10 @@ function testRenderAs() {
 		$this->assertFalse(in_array('Xml', $this->Controller->helpers));
 		$this->RequestHandler->renderAs($this->Controller, 'xml');
 		$this->assertTrue(in_array('Xml', $this->Controller->helpers));
+
+		$this->Controller->viewPath = 'request_handler_test\\xml';
+		$this->RequestHandler->renderAs($this->Controller, 'js');
+		$this->assertEqual($this->Controller->viewPath, 'request_handler_test' . DS . 'js');
 	}
 /**
  * test that calling renderAs() more than once continues to work.

From 604b7e0a100b64ddeef7988e416645279f57ddaa Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 14 Oct 2009 20:10:32 -0400
Subject: [PATCH 037/244] Splitting a long test for FormHelper up into smaller
 test cases.

---
 .../cases/libs/view/helpers/form.test.php     | 372 +++++++++---------
 1 file changed, 193 insertions(+), 179 deletions(-)

diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index 5712d81e8..7911f200c 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -1499,50 +1499,6 @@ function testFormInput() {
 		);
 		$this->assertTags($result, $expected);
 
-		$result = $this->Form->input('email', array(
-			'options' => array('è' => 'Firést', 'é' => 'Secoènd'), 'empty' => true)
-		);
-		$expected = array(
-			'div' => array('class' => 'input select'),
-			'label' => array('for' => 'email'),
-			'Email',
-			'/label',
-			array('select' => array('name' => 'data[email]', 'id' => 'email')),
-			array('option' => array('value' => '')),
-			'/option',
-			array('option' => array('value' => 'è')),
-			'Firést',
-			'/option',
-			array('option' => array('value' => 'é')),
-			'Secoènd',
-			'/option',
-			'/select',
-			'/div'
-		);
-		$this->assertTags($result, $expected);
-
-		$result = $this->Form->input('email', array(
-			'options' => array('First', 'Second'), 'empty' => true)
-		);
-		$expected = array(
-			'div' => array('class' => 'input select'),
-			'label' => array('for' => 'email'),
-			'Email',
-			'/label',
-			array('select' => array('name' => 'data[email]', 'id' => 'email')),
-			array('option' => array('value' => '')),
-			'/option',
-			array('option' => array('value' => '0')),
-			'First',
-			'/option',
-			array('option' => array('value' => '1')),
-			'Second',
-			'/option',
-			'/select',
-			'/div'
-		);
-		$this->assertTags($result, $expected);
-
 		$result = $this->Form->input('Contact.email', array(
 			'type' => 'file', 'class' => 'textbox'
 		));
@@ -1559,84 +1515,6 @@ function testFormInput() {
 		);
 		$this->assertTags($result, $expected);
 
-		$result = $this->Form->input('Contact.created', array('type' => 'time', 'timeFormat' => 24));
-		$result = explode(':', $result);
-		$this->assertPattern('/option value="23"/', $result[0]);
-		$this->assertNoPattern('/option value="24"/', $result[0]);
-
-		$result = $this->Form->input('Contact.created', array('type' => 'time', 'timeFormat' => 24));
-		$result = explode(':', $result);
-		$this->assertPattern('/option value="23"/', $result[0]);
-		$this->assertNoPattern('/option value="24"/', $result[0]);
-
-		$result = $this->Form->input('Model.field', array(
-			'type' => 'time', 'timeFormat' => 24, 'interval' => 15
-		));
-		$result = explode(':', $result);
-		$this->assertNoPattern('#<option value="12"[^>]*>12</option>#', $result[1]);
-		$this->assertNoPattern('#<option value="50"[^>]*>50</option>#', $result[1]);
-		$this->assertPattern('#<option value="15"[^>]*>15</option>#', $result[1]);
-
-		$result = $this->Form->input('Model.field', array(
-			'type' => 'time', 'timeFormat' => 12, 'interval' => 15
-		));
-		$result = explode(':', $result);
-		$this->assertNoPattern('#<option value="12"[^>]*>12</option>#', $result[1]);
-		$this->assertNoPattern('#<option value="50"[^>]*>50</option>#', $result[1]);
-		$this->assertPattern('#<option value="15"[^>]*>15</option>#', $result[1]);
-
-		$result = $this->Form->input('prueba', array(
-			'type' => 'time', 'timeFormat'=> 24 , 'dateFormat'=>'DMY' , 'minYear' => 2008,
-			'maxYear' => date('Y') + 1 ,'interval' => 15
-		));
-		$result = explode(':', $result);
-		$this->assertNoPattern('#<option value="12"[^>]*>12</option>#', $result[1]);
-		$this->assertNoPattern('#<option value="50"[^>]*>50</option>#', $result[1]);
-		$this->assertPattern('#<option value="15"[^>]*>15</option>#', $result[1]);
-		$this->assertPattern('#<option value="30"[^>]*>30</option>#', $result[1]);
-
-		$result = $this->Form->input('prueba', array(
-			'type' => 'datetime', 'timeFormat'=> 24 , 'dateFormat'=>'DMY' , 'minYear' => 2008,
-			'maxYear' => date('Y') + 1 ,'interval' => 15
-		));
-		$result = explode(':', $result);
-		$this->assertNoPattern('#<option value="12"[^>]*>12</option>#', $result[1]);
-		$this->assertNoPattern('#<option value="50"[^>]*>50</option>#', $result[1]);
-		$this->assertPattern('#<option value="15"[^>]*>15</option>#', $result[1]);
-		$this->assertPattern('#<option value="30"[^>]*>30</option>#', $result[1]);
-
-		//related to ticket #5013
-		$result = $this->Form->input('Contact.date', array(
-			'type' => 'date', 'class' => 'customClass', 'onChange' => 'function(){}'
-		));
-		$this->assertPattern('/class="customClass"/', $result);
-		$this->assertPattern('/onChange="function\(\)\{\}"/', $result);
-
-		$result = $this->Form->input('Contact.date', array(
-			'type' => 'date', 'id' => 'customId', 'onChange' => 'function(){}'
-		));
-		$this->assertPattern('/id="customIdDay"/', $result);
-		$this->assertPattern('/id="customIdMonth"/', $result);
-		$this->assertPattern('/onChange="function\(\)\{\}"/', $result);
-
-		$result = $this->Form->input('Model.field', array(
-			'type' => 'datetime', 'timeFormat' => 24, 'id' => 'customID'
-		));
-		$this->assertPattern('/id="customIDDay"/', $result);
-		$this->assertPattern('/id="customIDHour"/', $result);
-		$result = explode('</select><select', $result);
-		$result = explode(':', $result[1]);
-		$this->assertPattern('/option value="23"/', $result[0]);
-		$this->assertNoPattern('/option value="24"/', $result[0]);
-
-		$result = $this->Form->input('Model.field', array(
-			'type' => 'datetime', 'timeFormat' => 12
-		));
-		$result = explode('</select><select', $result);
-		$result = explode(':', $result[1]);
-		$this->assertPattern('/option value="12"/', $result[0]);
-		$this->assertNoPattern('/option value="13"/', $result[0]);
-
 		$this->Form->data = array('Contact' => array('phone' => 'Hello & World > weird chars'));
 		$result = $this->Form->input('Contact.phone');
 		$expected = array(
@@ -1653,7 +1531,6 @@ function testFormInput() {
 		);
 		$this->assertTags($result, $expected);
 
-
 		$this->Form->data['Model']['0']['OtherModel']['field'] = 'My value';
 		$result = $this->Form->input('Model.0.OtherModel.field', array('id' => 'myId'));
 		$expected = array(
@@ -1770,6 +1647,199 @@ function testFormInput() {
 		);
 		$this->assertTags($result, $expected);
 
+		$this->Form->validationErrors['Model']['field'] = 'minLength';
+		$result = $this->Form->input('Model.field', array('error' => array('minLength' => __('Le login doit contenir au moins 2 caractères', true))));
+		$expected = array(
+			'div' => array('class' => 'input text error'),
+			'label' => array('for' => 'ModelField'),
+			'Field',
+			'/label',
+			'input' => array('type' => 'text', 'name' => 'data[Model][field]', 'value' => '', 'id' => 'ModelField', 'class' => 'form-error'),
+			array('div' => array('class' => 'error-message')),
+			'Le login doit contenir au moins 2 caractères',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+/**
+ * test form->input() with datetime, date and time types
+ *
+ * @return void
+ **/
+	function testInputDatetime() {
+		extract($this->dateRegex);
+		$result = $this->Form->input('Contact.created', array('type' => 'time', 'timeFormat' => 24));
+		$result = explode(':', $result);
+		$this->assertPattern('/option value="23"/', $result[0]);
+		$this->assertNoPattern('/option value="24"/', $result[0]);
+
+		$result = $this->Form->input('Contact.created', array('type' => 'time', 'timeFormat' => 24));
+		$result = explode(':', $result);
+		$this->assertPattern('/option value="23"/', $result[0]);
+		$this->assertNoPattern('/option value="24"/', $result[0]);
+
+		$result = $this->Form->input('Model.field', array(
+			'type' => 'time', 'timeFormat' => 24, 'interval' => 15
+		));
+		$result = explode(':', $result);
+		$this->assertNoPattern('#<option value="12"[^>]*>12</option>#', $result[1]);
+		$this->assertNoPattern('#<option value="50"[^>]*>50</option>#', $result[1]);
+		$this->assertPattern('#<option value="15"[^>]*>15</option>#', $result[1]);
+
+		$result = $this->Form->input('Model.field', array(
+			'type' => 'time', 'timeFormat' => 12, 'interval' => 15
+		));
+		$result = explode(':', $result);
+		$this->assertNoPattern('#<option value="12"[^>]*>12</option>#', $result[1]);
+		$this->assertNoPattern('#<option value="50"[^>]*>50</option>#', $result[1]);
+		$this->assertPattern('#<option value="15"[^>]*>15</option>#', $result[1]);
+
+		$result = $this->Form->input('prueba', array(
+			'type' => 'time', 'timeFormat'=> 24 , 'dateFormat'=>'DMY' , 'minYear' => 2008,
+			'maxYear' => date('Y') + 1 ,'interval' => 15
+		));
+		$result = explode(':', $result);
+		$this->assertNoPattern('#<option value="12"[^>]*>12</option>#', $result[1]);
+		$this->assertNoPattern('#<option value="50"[^>]*>50</option>#', $result[1]);
+		$this->assertPattern('#<option value="15"[^>]*>15</option>#', $result[1]);
+		$this->assertPattern('#<option value="30"[^>]*>30</option>#', $result[1]);
+
+		$result = $this->Form->input('prueba', array(
+			'type' => 'datetime', 'timeFormat'=> 24 , 'dateFormat'=>'DMY' , 'minYear' => 2008,
+			'maxYear' => date('Y') + 1 ,'interval' => 15
+		));
+		$result = explode(':', $result);
+		$this->assertNoPattern('#<option value="12"[^>]*>12</option>#', $result[1]);
+		$this->assertNoPattern('#<option value="50"[^>]*>50</option>#', $result[1]);
+		$this->assertPattern('#<option value="15"[^>]*>15</option>#', $result[1]);
+		$this->assertPattern('#<option value="30"[^>]*>30</option>#', $result[1]);
+
+		//related to ticket #5013
+		$result = $this->Form->input('Contact.date', array(
+			'type' => 'date', 'class' => 'customClass', 'onChange' => 'function(){}'
+		));
+		$this->assertPattern('/class="customClass"/', $result);
+		$this->assertPattern('/onChange="function\(\)\{\}"/', $result);
+
+		$result = $this->Form->input('Contact.date', array(
+			'type' => 'date', 'id' => 'customId', 'onChange' => 'function(){}'
+		));
+		$this->assertPattern('/id="customIdDay"/', $result);
+		$this->assertPattern('/id="customIdMonth"/', $result);
+		$this->assertPattern('/onChange="function\(\)\{\}"/', $result);
+
+		$result = $this->Form->input('Model.field', array(
+			'type' => 'datetime', 'timeFormat' => 24, 'id' => 'customID'
+		));
+		$this->assertPattern('/id="customIDDay"/', $result);
+		$this->assertPattern('/id="customIDHour"/', $result);
+		$result = explode('</select><select', $result);
+		$result = explode(':', $result[1]);
+		$this->assertPattern('/option value="23"/', $result[0]);
+		$this->assertNoPattern('/option value="24"/', $result[0]);
+
+		$result = $this->Form->input('Model.field', array(
+			'type' => 'datetime', 'timeFormat' => 12
+		));
+		$result = explode('</select><select', $result);
+		$result = explode(':', $result[1]);
+		$this->assertPattern('/option value="12"/', $result[0]);
+		$this->assertNoPattern('/option value="13"/', $result[0]);
+
+		$this->Form->data = array('Contact' => array('created' => null));
+		$result = $this->Form->input('Contact.created', array('empty' => 'Date Unknown'));
+		$expected = array(
+			'div' => array('class' => 'input date'),
+			'label' => array('for' => 'ContactCreatedMonth'),
+			'Created',
+			'/label',
+			array('select' => array('name' => 'data[Contact][created][month]', 'id' => 'ContactCreatedMonth')),
+			array('option' => array('value' => '')), 'Date Unknown', '/option',
+			$monthsRegex,
+			'/select', '-',
+			array('select' => array('name' => 'data[Contact][created][day]', 'id' => 'ContactCreatedDay')),
+			array('option' => array('value' => '')), 'Date Unknown', '/option',
+			$daysRegex,
+			'/select', '-',
+			array('select' => array('name' => 'data[Contact][created][year]', 'id' => 'ContactCreatedYear')),
+			array('option' => array('value' => '')), 'Date Unknown', '/option',
+			$yearsRegex,
+			'/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+/**
+ * Test generating checkboxes in a loop.
+ *
+ * @return void
+ **/
+	function testInputCheckboxesInLoop() {
+		for ($i = 1; $i < 5; $i++) {
+			$result = $this->Form->input("Contact.{$i}.email", array('type' => 'checkbox', 'value' => $i));
+			$expected = array(
+				'div' => array('class' => 'input checkbox'),
+				'input' => array('type' => 'hidden', 'name' => "data[Contact][{$i}][email]", 'value' => '0', 'id' => "Contact{$i}Email_"),
+				array('input' => array('type' => 'checkbox', 'name' => "data[Contact][{$i}][email]", 'value' => $i, 'id' => "Contact{$i}Email")),
+				'label' => array('for' => "Contact{$i}Email"),
+				'Email',
+				'/label',
+				'/div'
+			);
+			$this->assertTags($result, $expected);
+		}
+	}
+/**
+ * test form->input() with select type inputs.
+ *
+ * @return void
+ **/
+	function testInputSelectType() {
+		$result = $this->Form->input('email', array(
+			'options' => array('è' => 'Firést', 'é' => 'Secoènd'), 'empty' => true)
+		);
+		$expected = array(
+			'div' => array('class' => 'input select'),
+			'label' => array('for' => 'email'),
+			'Email',
+			'/label',
+			array('select' => array('name' => 'data[email]', 'id' => 'email')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => 'è')),
+			'Firést',
+			'/option',
+			array('option' => array('value' => 'é')),
+			'Secoènd',
+			'/option',
+			'/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('email', array(
+			'options' => array('First', 'Second'), 'empty' => true)
+		);
+		$expected = array(
+			'div' => array('class' => 'input select'),
+			'label' => array('for' => 'email'),
+			'Email',
+			'/label',
+			array('select' => array('name' => 'data[email]', 'id' => 'email')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '0')),
+			'First',
+			'/option',
+			array('option' => array('value' => '1')),
+			'Second',
+			'/option',
+			'/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
 		$this->Form->data = array('Model' => array('user_id' => 'value'));
 		$view =& ClassRegistry::getObject('view');
 		$view->viewVars['users'] = array('value' => 'good', 'other' => 'bad');
@@ -1841,33 +1911,6 @@ function testFormInput() {
 		);
 		$this->assertTags($result, $expected);
 
-		extract($this->dateRegex);
-
-		$this->Form->data = array('Contact' => array('created' => null));
-		$view =& ClassRegistry::getObject('view');
-		$view->viewVars['users'] = array('value' => 'good', 'other' => 'bad');
-		$result = $this->Form->input('Contact.created', array('empty' => 'Date Unknown'));
-		$expected = array(
-			'div' => array('class' => 'input date'),
-			'label' => array('for' => 'ContactCreatedMonth'),
-			'Created',
-			'/label',
-			array('select' => array('name' => 'data[Contact][created][month]', 'id' => 'ContactCreatedMonth')),
-			array('option' => array('value' => '')), 'Date Unknown', '/option',
-			$monthsRegex,
-			'/select', '-',
-			array('select' => array('name' => 'data[Contact][created][day]', 'id' => 'ContactCreatedDay')),
-			array('option' => array('value' => '')), 'Date Unknown', '/option',
-			$daysRegex,
-			'/select', '-',
-			array('select' => array('name' => 'data[Contact][created][year]', 'id' => 'ContactCreatedYear')),
-			array('option' => array('value' => '')), 'Date Unknown', '/option',
-			$yearsRegex,
-			'/select',
-			'/div'
-		);
-		$this->assertTags($result, $expected);
-
 		$this->Form->data = array('User' => array('User' => array('value')));
 		$view =& ClassRegistry::getObject('view');
 		$view->viewVars['users'] = array('value' => 'good', 'other' => 'bad');
@@ -1891,35 +1934,6 @@ function testFormInput() {
 			'/div'
 		);
 		$this->assertTags($result, $expected);
-
-		$this->Form->validationErrors['Model']['field'] = 'minLength';
-		$result = $this->Form->input('Model.field', array('error' => array('minLength' => __('Le login doit contenir au moins 2 caractères', true))));
-		$expected = array(
-			'div' => array('class' => 'input text error'),
-			'label' => array('for' => 'ModelField'),
-			'Field',
-			'/label',
-			'input' => array('type' => 'text', 'name' => 'data[Model][field]', 'value' => '', 'id' => 'ModelField', 'class' => 'form-error'),
-			array('div' => array('class' => 'error-message')),
-			'Le login doit contenir au moins 2 caractères',
-			'/div',
-			'/div'
-		);
-		$this->assertTags($result, $expected);
-
-		for ($i = 1; $i < 5; $i++) {
-			$result = $this->Form->input("Contact.{$i}.email", array('type' => 'checkbox', 'value' => $i));
-			$expected = array(
-				'div' => array('class' => 'input checkbox'),
-				'input' => array('type' => 'hidden', 'name' => "data[Contact][{$i}][email]", 'value' => '0', 'id' => "Contact{$i}Email_"),
-				array('input' => array('type' => 'checkbox', 'name' => "data[Contact][{$i}][email]", 'value' => $i, 'id' => "Contact{$i}Email")),
-				'label' => array('for' => "Contact{$i}Email"),
-				'Email',
-				'/label',
-				'/div'
-			);
-			$this->assertTags($result, $expected);
-		}
 	}
 /**
  * testFormInputs method

From 082156f9a1842b3d3c5e0afca48c4dba69ccab12 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 14 Oct 2009 21:17:00 -0400
Subject: [PATCH 038/244] Fixing FormHelper::input() label's for attribute when
 a datetime type is created and dateFormat or timeFormat is set to NONE. Fixes
 #168

---
 cake/libs/view/helpers/form.php                  | 16 ++++++++++------
 cake/tests/cases/libs/view/helpers/form.test.php |  8 ++++++++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 0a58cea16..e71fff9be 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -708,9 +708,13 @@ function input($fieldName, $options = array()) {
 
 		if ($label !== false) {
 			$labelAttributes = $this->domId(array(), 'for');
-			if (in_array($options['type'], array('date', 'datetime'))) {
-				$labelAttributes['for'] .= 'Month';
-			} else if ($options['type'] === 'time') {
+			if ($options['type'] === 'date' || $options['type'] === 'datetime') {
+				if (isset($options['dateFormat']) && $options['dateFormat'] === 'NONE') {
+					$labelAttributes['for'] .= 'Hour';
+				} else {
+					$labelAttributes['for'] .= 'Month';
+				}
+			} elseif ($options['type'] === 'time') {
 				$labelAttributes['for'] .= 'Hour';
 			}
 
@@ -764,10 +768,10 @@ function input($fieldName, $options = array()) {
 			unset($options['dateFormat']);
 		}
 
-		$type	 = $options['type'];
-		$before	 = $options['before'];
+		$type = $options['type'];
+		$before = $options['before'];
 		$between = $options['between'];
-		$after	 = $options['after'];
+		$after = $options['after'];
 		unset($options['type'], $options['before'], $options['between'], $options['after']);
 
 		switch ($type) {
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index 7911f200c..0a83d59c3 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -1769,6 +1769,14 @@ function testInputDatetime() {
 			'/div'
 		);
 		$this->assertTags($result, $expected);
+
+		$this->Form->data = array('Contact' => array('created' => null));
+		$result = $this->Form->input('Contact.created', array('type' => 'datetime', 'dateFormat' => 'NONE'));
+		$this->assertPattern('/for\="ContactCreatedHour"/', $result);
+		
+		$this->Form->data = array('Contact' => array('created' => null));
+		$result = $this->Form->input('Contact.created', array('type' => 'datetime', 'timeFormat' => 'NONE'));
+		$this->assertPattern('/for\="ContactCreatedMonth"/', $result);
 	}
 /**
  * Test generating checkboxes in a loop.

From 43dbf716241bc16c227b8e85ddae3e65bdce4c3e Mon Sep 17 00:00:00 2001
From: "renan.saddam" <renan.saddam@gmail.com>
Date: Thu, 15 Oct 2009 18:09:58 -0300
Subject: [PATCH 039/244] Doing a little optimization for php 5.1 <, also
 fixing tests on Windows. Fixes #155.

---
 cake/libs/session.php                               | 12 ++++++------
 cake/tests/cases/libs/view/helpers/session.test.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cake/libs/session.php b/cake/libs/session.php
index 136865689..38697ae23 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -592,15 +592,15 @@ function _checkValid() {
 	function __regenerateId() {
 		$oldSessionId = session_id();
 		if ($oldSessionId) {
-			$sessionpath = session_save_path();
-			if (empty($sessionpath)) {
-				$sessionpath = "/tmp";
-			}
-			if (session_id() != "" || isset($_COOKIE[session_name()])) {
+			if (session_id() != ''|| isset($_COOKIE[session_name()])) {
 				setcookie(Configure::read('Session.cookie'), '', time() - 42000, $this->path);
 			}
 			session_regenerate_id(true);
 			if (PHP_VERSION < 5.1) {
+				$sessionPath = session_save_path();
+				if (empty($sessionPath)) {
+					$sessionPath = '/tmp';
+				}
 				$newSessid = session_id();
 
 				if (function_exists('session_write_close')) {
@@ -610,7 +610,7 @@ function __regenerateId() {
 				session_id($oldSessionId);
 				session_start();
 				session_destroy();
-				$file = $sessionpath . DS . "sess_$oldSessionId";
+				$file = $sessionPath . DS . 'sess_' . $oldSessionId;
 				@unlink($file);
 				$this->__initSession();
 				session_id($newSessid);
diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php
index 6f98c2acd..eb6e295e7 100644
--- a/cake/tests/cases/libs/view/helpers/session.test.php
+++ b/cake/tests/cases/libs/view/helpers/session.test.php
@@ -224,7 +224,7 @@ function testFlashMissingLayout() {
 		ob_clean();
 
 		$this->assertPattern("/Missing Layout/", $result);
-		$this->assertPattern("/layouts\/does_not_exist.ctp/", $result);
+		$this->assertPattern("/layouts(\\\|\/)does_not_exist.ctp/", $result);
 	}
 /**
  * testID method

From a36c2ec5bbaa7176ebf3403120fb6bc39f3b9fd5 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 16 Oct 2009 09:19:23 -0400
Subject: [PATCH 040/244] Removing self inclusions for test cases. Refs #174

---
 cake/tests/cases/libs/model/model_integration.test.php | 3 +--
 cake/tests/cases/libs/model/model_validation.test.php  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php
index e213187b6..cc1d8b20c 100644
--- a/cake/tests/cases/libs/model/model_integration.test.php
+++ b/cake/tests/cases/libs/model/model_integration.test.php
@@ -1,7 +1,7 @@
 <?php
 /* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
 /**
- * ModelDeleteTest file
+ * ModelIntegrationTest file
  *
  * Long description for file
  *
@@ -25,7 +25,6 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 require_once dirname(__FILE__) . DS . 'model.test.php';
-require_once dirname(__FILE__) . DS . 'model_integration.test.php';
 
 /**
  * ModelIntegrationTest
diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/cake/tests/cases/libs/model/model_validation.test.php
index b4dcf22fd..eb0b1de8e 100644
--- a/cake/tests/cases/libs/model/model_validation.test.php
+++ b/cake/tests/cases/libs/model/model_validation.test.php
@@ -25,7 +25,7 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 require_once dirname(__FILE__) . DS . 'model.test.php';
-require_once dirname(__FILE__) . DS . 'model_validation.test.php';
+
 /**
  * ModelValidationTest
  *

From 2675bbcd53ca3bad4aa9c9dabda0f8f9d0972dae Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 18 Oct 2009 22:05:17 -0400
Subject: [PATCH 041/244] Fixing FormHelper::__selectOptions incorrectly
 selecting options due to type juggling. Fixes #167

---
 cake/libs/view/helpers/form.php                 |  2 +-
 .../tests/cases/libs/view/helpers/form.test.php | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index e71fff9be..e1f3c4422 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -1721,7 +1721,7 @@ function __selectOptions($elements = array(), $selected = null, $parents = array
 			}
 
 			if ($name !== null) {
-				if ((!$selectedIsEmpty && $selected == $name) || ($selectedIsArray && in_array($name, $selected))) {
+				if ((!$selectedIsEmpty && (string)$selected == (string)$name) || ($selectedIsArray && in_array($name, $selected))) {
 					if ($attributes['style'] === 'checkbox') {
 						$htmlOptions['checked'] = true;
 					} else {
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index 0a83d59c3..a0241322f 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -2687,6 +2687,23 @@ function testSelect() {
 			'/select'
 		);
 		$this->assertTags($result, $expected);
+
+		$this->Form->data = array('Model' => array('contact_id' => 228));
+		$result = $this->Form->select(
+			'Model.contact_id',
+			array('228' => '228 value', '228-1' => '228-1 value', '228-2' => '228-2 value'),
+			null, array('escape' => false), 'pick something'
+		);
+
+		$expected = array(
+			'select' => array('name' => 'data[Model][contact_id]', 'id' => 'ModelContactId'),
+			array('option' => array('value' => '')), 'pick something', '/option',
+			array('option' => array('value' => '228', 'selected' => 'selected')), '228 value', '/option',
+			array('option' => array('value' => '228-1')), '228-1 value', '/option',
+			array('option' => array('value' => '228-2')), '228-2 value', '/option',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
 	}
 /**
  * Tests that FormHelper::select() allows null to be passed in the $attributes parameter

From 7ff3fcc4c4105e6a4475effff534f0429e1fe6aa Mon Sep 17 00:00:00 2001
From: jperras <joel.perras@gmail.com>
Date: Mon, 19 Oct 2009 12:51:06 -0400
Subject: [PATCH 042/244] Adding skip for non-existence of DateTimeZone class
 in time helper tests.

---
 cake/tests/cases/libs/view/helpers/time.test.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cake/tests/cases/libs/view/helpers/time.test.php b/cake/tests/cases/libs/view/helpers/time.test.php
index 94da2a997..fbaff45ab 100644
--- a/cake/tests/cases/libs/view/helpers/time.test.php
+++ b/cake/tests/cases/libs/view/helpers/time.test.php
@@ -639,6 +639,8 @@ function testWasWithinLast() {
  * @return void
  */
 	function testUserOffset() {
+		$this->skipIf(!class_exists('DateTimeZone'), '%s DateTimeZone class not available.');
+
 		$timezoneServer = new DateTimeZone(date_default_timezone_get());
 		$timeServer = new DateTime('now', $timezoneServer);
 		$yourTimezone = $timezoneServer->getOffset($timeServer) / HOUR;

From ae342c6f2c9e88290cdc4316bff7848a3a4a908e Mon Sep 17 00:00:00 2001
From: jperras <joel.perras@gmail.com>
Date: Mon, 19 Oct 2009 13:17:07 -0400
Subject: [PATCH 043/244] Fixing skip in previous commit: if skip condition
 evaluates to true, to prevent a fatal error from being produced.

---
 cake/tests/cases/libs/view/helpers/time.test.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cake/tests/cases/libs/view/helpers/time.test.php b/cake/tests/cases/libs/view/helpers/time.test.php
index fbaff45ab..7fd5c1b15 100644
--- a/cake/tests/cases/libs/view/helpers/time.test.php
+++ b/cake/tests/cases/libs/view/helpers/time.test.php
@@ -639,7 +639,10 @@ function testWasWithinLast() {
  * @return void
  */
 	function testUserOffset() {
-		$this->skipIf(!class_exists('DateTimeZone'), '%s DateTimeZone class not available.');
+		if ($this->skipIf(!class_exists('DateTimeZone'), '%s DateTimeZone class not available.')) {
+			return;
+		}
+
 
 		$timezoneServer = new DateTimeZone(date_default_timezone_get());
 		$timeServer = new DateTime('now', $timezoneServer);

From 79e96e5aefa5095500b3efd45b2426bc88fc7143 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 19 Oct 2009 16:36:44 -0400
Subject: [PATCH 044/244] Updating localePaths path. Fixes #184

---
 cake/tests/cases/basics.test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php
index 7baeeb60f..800cb7dc3 100644
--- a/cake/tests/cases/basics.test.php
+++ b/cake/tests/cases/basics.test.php
@@ -41,7 +41,7 @@ class BasicsTest extends CakeTestCase {
  */
 	function setUp() {
 		$this->_localePaths = Configure::read('localePaths');
-		Configure::write('localePaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale'));
+		Configure::write('localePaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale' .DS ));
 		$this->_language = Configure::read('Config.language');
 	}
 /**

From 3922f136dab019cbfe93ddb828d6a0dcba8cc72a Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 19 Oct 2009 20:54:02 -0400
Subject: [PATCH 045/244] Making DboMysqlTest pass when a connection with a
 prefix is used.  Fixes #185

---
 .../libs/model/datasources/dbo/dbo_mysql.test.php    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
index 691a86c1f..cf9cc833c 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
@@ -273,7 +273,7 @@ function testTinyintCasting() {
 		$this->db->query('CREATE TABLE ' . $this->db->fullTableName('tinyint') . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id));');
 
 		$this->model = new CakeTestModel(array(
-			'name' => 'Tinyint', 'table' => $this->db->fullTableName('tinyint', false)
+			'name' => 'Tinyint', 'table' => 'tinyint', 'ds' => 'test_suite'
 		));
 
 		$result = $this->model->schema();
@@ -312,7 +312,7 @@ function testIndexDetection() {
 		$name = $this->db->fullTableName('simple');
 		$this->db->query('CREATE TABLE ' . $name . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id));');
 		$expected = array('PRIMARY' => array('column' => 'id', 'unique' => 1));
-		$result = $this->db->index($name, false);
+		$result = $this->db->index('simple', false);
 		$this->assertEqual($expected, $result);
 		$this->db->query('DROP TABLE ' . $name);
 
@@ -322,7 +322,7 @@ function testIndexDetection() {
 			'PRIMARY' => array('column' => 'id', 'unique' => 1),
 			'pointless_bool' => array('column' => 'bool', 'unique' => 0),
 		);
-		$result = $this->db->index($name, false);
+		$result = $this->db->index('with_a_key', false);
 		$this->assertEqual($expected, $result);
 		$this->db->query('DROP TABLE ' . $name);
 
@@ -333,7 +333,7 @@ function testIndexDetection() {
 			'pointless_bool' => array('column' => 'bool', 'unique' => 0),
 			'pointless_small_int' => array('column' => 'small_int', 'unique' => 0),
 		);
-		$result = $this->db->index($name, false);
+		$result = $this->db->index('with_two_keys', false);
 		$this->assertEqual($expected, $result);
 		$this->db->query('DROP TABLE ' . $name);
 
@@ -345,7 +345,7 @@ function testIndexDetection() {
 			'pointless_small_int' => array('column' => 'small_int', 'unique' => 0),
 			'one_way' => array('column' => array('bool', 'small_int'), 'unique' => 0),
 		);
-		$result = $this->db->index($name, false);
+		$result = $this->db->index('with_compound_keys', false);
 		$this->assertEqual($expected, $result);
 		$this->db->query('DROP TABLE ' . $name);
 
@@ -358,7 +358,7 @@ function testIndexDetection() {
 			'one_way' => array('column' => array('bool', 'small_int'), 'unique' => 0),
 			'other_way' => array('column' => array('small_int', 'bool'), 'unique' => 0),
 		);
-		$result = $this->db->index($name, false);
+		$result = $this->db->index('with_multiple_compound_keys', false);
 		$this->assertEqual($expected, $result);
 		$this->db->query('DROP TABLE ' . $name);
 	}

From 0a79822b9de901de6f5098990beb4086d98901c3 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 19 Oct 2009 21:09:47 -0400
Subject: [PATCH 046/244] Expanding some doc blocks for DataSource.

---
 cake/libs/model/datasources/datasource.php | 34 +++++++++++++---------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php
index b1b2baefb..c92f8aff6 100644
--- a/cake/libs/model/datasources/datasource.php
+++ b/cake/libs/model/datasources/datasource.php
@@ -287,42 +287,50 @@ function column($real) {
 		return false;
 	}
 /**
+ * Used to create new records. The "C" CRUD.
+ *
  * To-be-overridden in subclasses.
  *
- * @param unknown_type $model
- * @param unknown_type $fields
- * @param unknown_type $values
- * @return unknown
+ * @param Model $model The Model to be created.
+ * @param array $fields An Array of fields to be saved.
+ * @param array $values An Array of values to save.
+ * @return boolean success
  */
 	function create(&$model, $fields = null, $values = null) {
 		return false;
 	}
 /**
+ * Used to read records from the Datasource. The "R" in CRUD
+ *
  * To-be-overridden in subclasses.
  *
- * @param unknown_type $model
- * @param unknown_type $queryData
- * @return unknown
+ * @param Model $model The model being read.
+ * @param array $queryData An array of query data used to find the data you want
+ * @return mixed
  */
 	function read(&$model, $queryData = array()) {
 		return false;
 	}
 /**
+ * Update a record(s) in the datasource.
+ *
  * To-be-overridden in subclasses.
  *
- * @param unknown_type $model
- * @param unknown_type $fields
- * @param unknown_type $values
- * @return unknown
+ * @param Model $model Instance of the model class being updated
+ * @param array $fields Array of fields to be updated
+ * @param array $values Array of values to be update $fields to.
+ * @return boolean Success
  */
 	function update(&$model, $fields = null, $values = null) {
 		return false;
 	}
 /**
+ * Delete a record(s) in the datasource.
+ *
  * To-be-overridden in subclasses.
  *
- * @param unknown_type $model
- * @param unknown_type $id
+ * @param Model $model The model class having record(s) deleted
+ * @param mixed $id Primary key of the model 
  */
 	function delete(&$model, $id = null) {
 		if ($id == null) {

From a15289fba87f3b3b5a9add16efa3ac9250c85bd8 Mon Sep 17 00:00:00 2001
From: "renan.saddam" <renan.saddam@gmail.com>
Date: Tue, 20 Oct 2009 16:16:31 -0200
Subject: [PATCH 047/244] Saving few Router::normalize() calls, will may
 increase performance. Fixes #179.

---
 cake/libs/controller/components/auth.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
index a68e5b6f2..420305d57 100644
--- a/cake/libs/controller/components/auth.php
+++ b/cake/libs/controller/components/auth.php
@@ -421,10 +421,10 @@ function __setDefaults() {
 			return false;
 		}
 		$defaults = array(
-			'loginAction' => Router::normalize(array(
-				'controller'=> Inflector::underscore(Inflector::pluralize($this->userModel)),
+			'loginAction' => array(
+				'controller' => Inflector::underscore(Inflector::pluralize($this->userModel)),
 				'action' => 'login'
-			)),
+			),
 			'sessionKey' => 'Auth.' . $this->userModel,
 			'logoutRedirect' => $this->loginAction,
 			'loginError' => __('Login failed. Invalid username or password.', true),

From 072e1efc130fed9443783910fd6c4ddf884f40d3 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 20 Oct 2009 16:11:31 -0400
Subject: [PATCH 048/244] Adding Datasource::enabled() Allows for checking a
 datasource's ability to be used before attempting to connect it. Added
 enabled() to all the core dbo's. Fixes whitescreen when trying to use a non
 installed database driver. Fixes #131

---
 cake/libs/model/datasources/datasource.php       | 10 ++++++++++
 cake/libs/model/datasources/dbo/dbo_adodb.php    | 12 +++++++++++-
 cake/libs/model/datasources/dbo/dbo_db2.php      |  8 ++++++++
 cake/libs/model/datasources/dbo/dbo_firebird.php |  9 +++++++++
 cake/libs/model/datasources/dbo/dbo_mssql.php    |  8 ++++++++
 cake/libs/model/datasources/dbo/dbo_mysql.php    |  8 ++++++++
 cake/libs/model/datasources/dbo/dbo_mysqli.php   |  8 ++++++++
 cake/libs/model/datasources/dbo/dbo_odbc.php     |  8 ++++++++
 cake/libs/model/datasources/dbo/dbo_postgres.php |  8 ++++++++
 cake/libs/model/datasources/dbo/dbo_sqlite.php   |  8 ++++++++
 cake/libs/model/datasources/dbo/dbo_sybase.php   |  8 ++++++++
 cake/libs/model/datasources/dbo_source.php       |  4 +++-
 12 files changed, 97 insertions(+), 2 deletions(-)

diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php
index c92f8aff6..fa7b6632d 100644
--- a/cake/libs/model/datasources/datasource.php
+++ b/cake/libs/model/datasources/datasource.php
@@ -364,6 +364,16 @@ function lastNumRows($source = null) {
 	function lastAffected($source = null) {
 		return false;
 	}
+/**
+ * Check whether the conditions for the Datasource being available
+ * are satisfied.  Often used from connect() to check for support
+ * before establishing a connection.
+ *
+ * @return boolean Whether or not the Datasources conditions for use are met.
+ **/
+	function enabled() {
+		return true;
+	}
 /**
  * Returns true if the DataSource supports the given interface (method)
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_adodb.php b/cake/libs/model/datasources/dbo/dbo_adodb.php
index 53d6f9601..45fa4048e 100644
--- a/cake/libs/model/datasources/dbo/dbo_adodb.php
+++ b/cake/libs/model/datasources/dbo/dbo_adodb.php
@@ -102,7 +102,9 @@ function connect() {
 			$adodb_driver = substr($config['connect'], 0, $persistent);
 			$connect = 'PConnect';
 		}
-
+		if (!$this->enabled()) {
+			return false;
+		}
 		$this->_adodb = NewADOConnection($adodb_driver);
 
 		$this->_adodbDataDict = NewDataDictionary($this->_adodb, $adodb_driver);
@@ -114,6 +116,14 @@ function connect() {
 		$this->_adodbMetatyper = &$this->_adodb->execute('Select 1');
 		return $this->connected;
 	}
+/**
+ * Check that AdoDB is available.
+ *
+ * @return boolean
+ **/
+	function enabled() {
+		return function_exists('NewADOConnection');
+	}
 /**
  * Disconnects from database.
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_db2.php b/cake/libs/model/datasources/dbo/dbo_db2.php
index 4e65d3b43..0942dee85 100644
--- a/cake/libs/model/datasources/dbo/dbo_db2.php
+++ b/cake/libs/model/datasources/dbo/dbo_db2.php
@@ -136,6 +136,14 @@ function connect() {
 		}
 		return $this->connected;
 	}
+/**
+ * Check that the DB2 extension is installed/loaded
+ *
+ * @return boolean
+ **/
+	function enabled() {
+		return extension_loaded('ibm_db2');
+	}
 /**
  * Disconnects from database.
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_firebird.php b/cake/libs/model/datasources/dbo/dbo_firebird.php
index d02c45b76..dc9cec15f 100644
--- a/cake/libs/model/datasources/dbo/dbo_firebird.php
+++ b/cake/libs/model/datasources/dbo/dbo_firebird.php
@@ -127,9 +127,18 @@ function connect() {
 		$connect = $config['connect'];
 
 		$this->connected = false;
+
 		$this->connection = $connect($config['host'] . ':' . $config['database'], $config['login'], $config['password']);
 		$this->connected = true;
 	}
+/**
+ * Check that the interbase extension is loaded
+ *
+ * @return boolean
+ **/
+	function enabled() {
+		return extension_loaded('interbase');
+	}
 /**
  * Disconnects from database.
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index 1b1219d59..b93192f95 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -152,6 +152,14 @@ function connect() {
 		}
 		return $this->connected;
 	}
+/**
+ * Check that MsSQL is installed/loaded
+ *
+ * @return boolean
+ **/
+	function enabled() {
+		return extension_loaded('mssql');
+	}
 /**
  * Disconnects from database.
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index 2d97e141c..58433beca 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -388,6 +388,14 @@ function connect() {
 
 		return $this->connected;
 	}
+/**
+ * Check whether the MySQL extension is installed/loaded
+ *
+ * @return boolean
+ **/
+	function enabled() {
+		return extension_loaded('mysql');
+	}
 /**
  * Disconnects from database.
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index b0adf8d2e..bf9797d43 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -83,6 +83,14 @@ function connect() {
 		}
 		return $this->connected;
 	}
+/**
+ * Check that MySQLi is installed/enabled
+ *
+ * @return boolean
+ **/
+	function enabled() {
+		return extension_loaded('mysqli');
+	}
 /**
  * Disconnects from database.
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_odbc.php b/cake/libs/model/datasources/dbo/dbo_odbc.php
index a8572a713..e68948668 100644
--- a/cake/libs/model/datasources/dbo/dbo_odbc.php
+++ b/cake/libs/model/datasources/dbo/dbo_odbc.php
@@ -105,6 +105,14 @@ function connect() {
 
 		return $this->connected;
 	}
+/**
+ * Check if the ODBC extension is installed/loaded
+ *
+ * @return boolean
+ **/
+	function enabled() {
+		return extension_loaded('odbc');
+	}
 /**
  * Disconnects from database.
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index 2298fc019..192355fd6 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -122,6 +122,14 @@ function connect() {
 		}
 		return $this->connected;
 	}
+/**
+ * Check if PostgreSQL is enabled/loaded
+ *
+ * @return boolean
+ **/
+	function enabled() {
+		return extension_loaded('pgsql');
+	}
 /**
  * Disconnects from database.
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index c365b6fe0..005ffc6fe 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -113,6 +113,14 @@ function connect() {
 		}
 		return $this->connected;
 	}
+/**
+ * Check that SQLite is enabled/installed
+ *
+ * @return boolean
+ **/
+	function enabled() {
+		return extension_loaded('sqlite');
+	}
 /**
  * Disconnects from database.
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_sybase.php b/cake/libs/model/datasources/dbo/dbo_sybase.php
index 4bed00e43..45e8fd057 100644
--- a/cake/libs/model/datasources/dbo/dbo_sybase.php
+++ b/cake/libs/model/datasources/dbo/dbo_sybase.php
@@ -102,6 +102,14 @@ function connect() {
 		$this->connected = sybase_select_db($config['database'], $this->connection);
 		return $this->connected;
 	}
+/**
+ * Check that one of the sybase extensions is installed
+ *
+ * @return boolean
+ **/
+	function enabled() {
+		return extension_loaded('sybase') || extension_loaded('sybase_ct');
+	}
 /**
  * Disconnects from database.
  *
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 1b10243d9..013a5baee 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -91,7 +91,9 @@ function __construct($config = null, $autoConnect = true) {
 		}
 		parent::__construct($config);
 		$this->fullDebug = Configure::read() > 1;
-
+		if (!$this->enabled()) {
+			return false;
+		}
 		if ($autoConnect) {
 			return $this->connect();
 		} else {

From c6f783ebfe04e33eb7b342a6ed18ccc5986e3990 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 20 Oct 2009 22:19:32 -0400
Subject: [PATCH 049/244] Fixing issues with CakeTestCase test case and debug =
 3.  Fixes #189

---
 cake/tests/cases/libs/cake_test_case.test.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cake/tests/cases/libs/cake_test_case.test.php b/cake/tests/cases/libs/cake_test_case.test.php
index 895eaaf40..930683c75 100644
--- a/cake/tests/cases/libs/cake_test_case.test.php
+++ b/cake/tests/cases/libs/cake_test_case.test.php
@@ -78,6 +78,7 @@ class CakeTestCaseTest extends CakeTestCase {
  * @return void
  */
 	function setUp() {
+		$this->_debug = Configure::read('debug');
 		$this->Case =& new SubjectCakeTestCase();
 		$reporter =& new MockCakeHtmlReporter();
 		$this->Case->setReporter($reporter);
@@ -90,6 +91,7 @@ function setUp() {
  * @return void
  */
 	function tearDown() {
+		Configure::write('debug', $this->_debug);
 		unset($this->Case);
 		unset($this->Reporter);
 	}
@@ -239,6 +241,8 @@ function testGetTests() {
  * @return void
  **/
 	function testTestAction() {
+		Configure::write('debug', 2);
+
 		$_back = array(
 			'controller' => Configure::read('controllerPaths'),
 			'view' => Configure::read('viewPaths'),

From 0e23fdfbb3d2889870215cfa459e5bbae87acbdb Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 21 Oct 2009 00:22:36 -0400
Subject: [PATCH 050/244] Fixing infinitely nesting stack frames when
 TreeBehavior::reorder() is called and the models $cacheQueries = true and
 there are a sizable number of records being manipulated. Test cases added.
 Fixes #188

---
 cake/libs/model/behaviors/tree.php            |  5 ++++-
 .../cases/libs/model/behaviors/tree.test.php  | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php
index da23c193d..145d298e1 100644
--- a/cake/libs/model/behaviors/tree.php
+++ b/cake/libs/model/behaviors/tree.php
@@ -460,7 +460,7 @@ function movedown(&$Model, $id = null, $number = 1) {
 			'fields' => array($Model->primaryKey, $left, $right), 'recursive' => $recursive)
 		);
 		if ($nextNode) {
-			list($nextNode)= array_values($nextNode);
+			list($nextNode) = array_values($nextNode);
 		} else {
 			return false;
 		}
@@ -640,6 +640,8 @@ function reorder(&$Model, $options = array()) {
 		$sort = $field . ' ' . $order;
 		$nodes = $this->children($Model, $id, true, $fields, $sort, null, null, $recursive);
 
+		$cacheQueries = $Model->cacheQueries;
+		$Model->cacheQueries = false;
 		if ($nodes) {
 			foreach ($nodes as $node) {
 				$id = $node[$Model->alias][$Model->primaryKey];
@@ -649,6 +651,7 @@ function reorder(&$Model, $options = array()) {
 				}
 			}
 		}
+		$Model->cacheQueries = $cacheQueries;
 		return true;
 	}
 /**
diff --git a/cake/tests/cases/libs/model/behaviors/tree.test.php b/cake/tests/cases/libs/model/behaviors/tree.test.php
index 147da89ae..86834122b 100644
--- a/cake/tests/cases/libs/model/behaviors/tree.test.php
+++ b/cake/tests/cases/libs/model/behaviors/tree.test.php
@@ -1172,6 +1172,25 @@ function testReorderTree() {
 		$sortedNodes = $this->Tree->find('list', array('order' => $leftField));
 		$this->assertIdentical($nodes, $sortedNodes);
 	}
+/**
+ * test reordering large-ish trees with cacheQueries = true.
+ * This caused infinite loops when moving down elements as stale data is returned
+ * from the memory cache
+ *
+ * @access public
+ * @return void
+ */
+	function testReorderBigTreeWithQueryCaching() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 10);
+
+		$original = $this->Tree->cacheQueries;
+		$this->Tree->cacheQueries = true;
+		$this->Tree->reorder(array('field' => 'name', 'direction' => 'DESC'));
+		$this->assertTrue($this->Tree->cacheQueries, 'cacheQueries was not restored after reorder(). %s');
+		$this->Tree->cacheQueries = $original;
+	}
 /**
  * testGenerateTreeListWithSelfJoin method
  *

From 0cc1d84737a1445e4f2972b70b658bfb56e60997 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 27 Aug 2009 22:51:10 -0400
Subject: [PATCH 051/244] Removing use of e() from core and test suite.

---
 cake/console/libs/templates/skel/views/layouts/xml/default.ctp | 2 +-
 cake/tests/test_app/views/layouts/xml/default.ctp              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/console/libs/templates/skel/views/layouts/xml/default.ctp b/cake/console/libs/templates/skel/views/layouts/xml/default.ctp
index c68870298..566ca2158 100644
--- a/cake/console/libs/templates/skel/views/layouts/xml/default.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/xml/default.ctp
@@ -1,2 +1,2 @@
-<?php e($xml->header()); ?>
+<?php echo $xml->header(); ?>
 <?php echo $content_for_layout; ?>
\ No newline at end of file
diff --git a/cake/tests/test_app/views/layouts/xml/default.ctp b/cake/tests/test_app/views/layouts/xml/default.ctp
index c68870298..566ca2158 100644
--- a/cake/tests/test_app/views/layouts/xml/default.ctp
+++ b/cake/tests/test_app/views/layouts/xml/default.ctp
@@ -1,2 +1,2 @@
-<?php e($xml->header()); ?>
+<?php echo $xml->header(); ?>
 <?php echo $content_for_layout; ?>
\ No newline at end of file

From 8b419d2dd8b0e2fa4bfa1c3e549aeba5a31c80c1 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 27 Aug 2009 22:54:57 -0400
Subject: [PATCH 052/244] Removing use of ife() from core classes.

---
 cake/libs/validation.php              | 2 +-
 cake/libs/view/helpers/javascript.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index be0d20c2a..6531d97d9 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -806,7 +806,7 @@ function url($check, $strict = false) {
 		$_this =& Validation::getInstance();
 		$_this->check = $check;
 		$validChars = '([' . preg_quote('!"$&\'()*+,-.@_:;=') . '\/0-9a-z]|(%[0-9a-f]{2}))';
-		$_this->regex = '/^(?:(?:https?|ftps?|file|news|gopher):\/\/)' . ife($strict, '', '?') .
+		$_this->regex = '/^(?:(?:https?|ftps?|file|news|gopher):\/\/)' . (!empty($strict) ? '' : '?') .
 			'(?:' . $_this->__pattern['ip'] . '|' . $_this->__pattern['hostname'] . ')(?::[1-9][0-9]{0,3})?' .
 			'(?:\/?|\/' . $validChars . '*)?' .
 			'(?:\?' . $validChars . '*)?' .
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index 21eab7f44..aa8d7577f 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -678,7 +678,7 @@ function value($val, $quoteStrings = true) {
 				$val = 'null';
 			break;
 			case (is_bool($val)):
-				$val = ife($val, 'true', 'false');
+				$val = !empty($val) ? 'true' : 'false';
 			break;
 			case (is_int($val)):
 				$val = $val;

From 0657afcf30763320664262bfd3f6fbfee0042c14 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 21 Oct 2009 13:03:24 -0400
Subject: [PATCH 053/244] Removing use of low() from core classes. Refs #6525

---
 cake/basics.php                       |  2 +-
 cake/console/libs/api.php             |  4 ++--
 cake/console/libs/tasks/db_config.php | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cake/basics.php b/cake/basics.php
index 5e387c553..8a9c7b527 100644
--- a/cake/basics.php
+++ b/cake/basics.php
@@ -467,7 +467,7 @@ function cache($path, $data = null, $expires = '+1 day', $target = 'cache') {
 			$expires = strtotime($expires, $now);
 		}
 
-		switch (low($target)) {
+		switch (strtolower($target)) {
 			case 'cache':
 				$filename = CACHE . $path;
 			break;
diff --git a/cake/console/libs/api.php b/cake/console/libs/api.php
index 87aefc10a..c370d7310 100644
--- a/cake/console/libs/api.php
+++ b/cake/console/libs/api.php
@@ -169,8 +169,8 @@ function help() {
 			foreach ($commands as $cmd) {
 				$this->out("{$cmd}\n\n");
 			}
-		} elseif (isset($commands[low($this->args[1])])) {
-			$this->out($commands[low($this->args[1])] . "\n\n");
+		} elseif (isset($commands[strtolower($this->args[1])])) {
+			$this->out($commands[strtolower($this->args[1])] . "\n\n");
 		} else {
 			$this->out("Command '" . $this->args[1] . "' not found");
 		}
diff --git a/cake/console/libs/tasks/db_config.php b/cake/console/libs/tasks/db_config.php
index d2f05393b..3126c00d9 100644
--- a/cake/console/libs/tasks/db_config.php
+++ b/cake/console/libs/tasks/db_config.php
@@ -109,7 +109,7 @@ function __interactive() {
 				$persistent = $this->in('Persistent Connection?', array('y', 'n'), 'n');
 			}
 
-			if (low($persistent) == 'n') {
+			if (strtolower($persistent) == 'n') {
 				$persistent = 'false';
 			} else {
 				$persistent = 'true';
@@ -125,7 +125,7 @@ function __interactive() {
 				$port = $this->in('Port?', null, 'n');
 			}
 
-			if (low($port) == 'n') {
+			if (strtolower($port) == 'n') {
 				$port = null;
 			}
 			$login = '';
@@ -158,7 +158,7 @@ function __interactive() {
 				$prefix = $this->in('Table Prefix?', null, 'n');
 			}
 
-			if (low($prefix) == 'n') {
+			if (strtolower($prefix) == 'n') {
 				$prefix = null;
 			}
 			$encoding = '';
@@ -167,7 +167,7 @@ function __interactive() {
 				$encoding = $this->in('Table encoding?', null, 'n');
 			}
 
-			if (low($encoding) == 'n') {
+			if (strtolower($encoding) == 'n') {
 				$encoding = null;
 			}
 			$schema = '';
@@ -178,7 +178,7 @@ function __interactive() {
 				}
 			}
 
-			if (low($schema) == 'n') {
+			if (strtolower($schema) == 'n') {
 				$schema = null;
 			}
 
@@ -190,7 +190,7 @@ function __interactive() {
 			$dbConfigs[] = $config;
 			$doneYet = $this->in('Do you wish to add another database configuration?', null, 'n');
 
-			if (low($doneYet == 'n')) {
+			if (strtolower($doneYet == 'n')) {
 				$done = true;
 			}
 		}

From 1ee9771efbe2f6dd0431ac5b025e0f6fd55b9b89 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 21 Oct 2009 13:12:03 -0400
Subject: [PATCH 054/244] Removing ife() from AclShell. Refs #6562

---
 cake/console/libs/acl.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cake/console/libs/acl.php b/cake/console/libs/acl.php
index 5a7873da8..15b678404 100644
--- a/cake/console/libs/acl.php
+++ b/cake/console/libs/acl.php
@@ -225,7 +225,7 @@ function getPath() {
 		$this->_checkArgs(2, 'getPath');
 		$this->checkNodeType();
 		extract($this->__dataVars());
-		$id = ife(is_numeric($this->args[1]), intval($this->args[1]), $this->args[1]);
+		$id = is_numeric($this->args[1]) ? intval($this->args[1]) : $this->args[1];
 		$nodes = $this->Acl->{$class}->getPath($id);
 		if (empty($nodes)) {
 			$this->error(sprintf(__("Supplied Node '%s' not found", true), $this->args[1]), __("No tree returned.", true));
@@ -304,7 +304,7 @@ function view() {
 		$this->checkNodeType();
 		extract($this->__dataVars());
 		if (isset($this->args[1]) && !is_null($this->args[1])) {
-			$key = ife(is_numeric($this->args[1]), $secondary_id, 'alias');
+			$key = is_numeric($this->args[1]) ? $secondary_id : 'alias';
 			$conditions = array($class . '.' . $key => $this->args[1]);
 		} else {
 			$conditions = null;
@@ -425,8 +425,8 @@ function help() {
 			foreach ($commands as $cmd) {
 				$this->out("{$cmd}\n\n");
 			}
-		} elseif (isset($commands[low($this->args[0])])) {
-			$this->out($commands[low($this->args[0])] . "\n\n");
+		} elseif (isset($commands[strtolower($this->args[0])])) {
+			$this->out($commands[strtolower($this->args[0])] . "\n\n");
 		} else {
 			$this->out(sprintf(__("Command '%s' not found", true), $this->args[0]));
 		}
@@ -457,7 +457,7 @@ function nodeExists() {
 			return false;
 		}
 		extract($this->__dataVars($this->args[0]));
-		$key = (ife(is_numeric($this->args[1]), $secondary_id, 'alias'));
+		$key = is_numeric($this->args[1]) ? $secondary_id : 'alias';
 		$conditions = array($class . '.' . $key => $this->args[1]);
 		$possibility = $this->Acl->{$class}->find('all', compact('conditions'));
 		if (empty($possibility)) {
@@ -472,8 +472,8 @@ function nodeExists() {
  * @access private
  */
 	function __getParams() {
-		$aro = ife(is_numeric($this->args[0]), intval($this->args[0]), $this->args[0]);
-		$aco = ife(is_numeric($this->args[1]), intval($this->args[1]), $this->args[1]);
+		$aro = is_numeric($this->args[0]) ? intval($this->args[0]) : $this->args[0];
+		$aco = is_numeric($this->args[1]) ? intval($this->args[1]) : $this->args[1];
 
 		if (is_string($aro) && preg_match('/^([\w]+)\.(.*)$/', $aro, $matches)) {
 			$aro = array(
@@ -512,7 +512,7 @@ function __dataVars($type = null) {
 		}
 		$vars = array();
 		$class = ucwords($type);
-		$vars['secondary_id'] = ife(strtolower($class) == 'aro', 'foreign_key', 'object_id');
+		$vars['secondary_id'] = strtolower($class) == 'aro' ? 'foreign_key' : 'object_id';
 		$vars['data_name'] = $type;
 		$vars['table_name'] = $type . 's';
 		$vars['class'] = $class;

From 4e8c268536081966f124cea7c5947fe341cc6d6a Mon Sep 17 00:00:00 2001
From: "renan.saddam" <renan.saddam@gmail.com>
Date: Wed, 21 Oct 2009 19:19:21 -0200
Subject: [PATCH 055/244] Making the test more clear by avoind +-2 days thing.
 Fixes #186.

---
 .../cases/libs/view/helpers/time.test.php     | 62 ++++---------------
 1 file changed, 12 insertions(+), 50 deletions(-)

diff --git a/cake/tests/cases/libs/view/helpers/time.test.php b/cake/tests/cases/libs/view/helpers/time.test.php
index 7fd5c1b15..997d3092b 100644
--- a/cake/tests/cases/libs/view/helpers/time.test.php
+++ b/cake/tests/cases/libs/view/helpers/time.test.php
@@ -470,57 +470,19 @@ function testIsToday() {
  * @return void
  */
 	function testIsThisWeek() {
-		switch (date('D')) {
-			case 'Mon' :
-				for ($i = 0; $i < 6; $i++) {
-					$this->assertTrue($this->Time->isThisWeek("+$i days"));
-				}
-				$this->assertFalse($this->Time->isThisWeek("+7 days"));
-				$this->assertFalse($this->Time->isThisWeek("-1 days"));
-				break;
-			case 'Tue' :
-				for ($i = -1; $i < 5; $i++) {
-					$this->assertTrue($this->Time->isThisWeek("+$i days"));
-				}
-				$this->assertFalse($this->Time->isThisWeek("+6 days"));
-				$this->assertFalse($this->Time->isThisWeek("-2 days"));
-				break;
-			case 'Wed' :
-				for ($i = -2; $i < 5; $i++) {
-					$this->assertTrue($this->Time->isThisWeek("+$i days"));
-				}
-				$this->assertFalse($this->Time->isThisWeek("+5 days"));
-				$this->assertFalse($this->Time->isThisWeek("-3 days"));
-				break;
-			case 'Thu' :
-				for ($i = -3; $i < 4; $i++) {
-					$this->assertTrue($this->Time->isThisWeek("+$i days"));
-				}
-				$this->assertFalse($this->Time->isThisWeek("+4 days"));
-				$this->assertFalse($this->Time->isThisWeek("-4 days"));
-				break;
-			case 'Fri' :
-				for ($i = -4; $i < 3; $i++) {
-					$this->assertTrue($this->Time->isThisWeek("+$i days"));
-				}
-				$this->assertFalse($this->Time->isThisWeek("+3 days"));
-				$this->assertFalse($this->Time->isThisWeek("-5 days"));
-				break;
-			case 'Sat' :
-				for ($i = -5; $i < 2; $i++) {
-					$this->assertTrue($this->Time->isThisWeek("+$i days"));
-				}
-				$this->assertFalse($this->Time->isThisWeek("+2 days"));
-				$this->assertFalse($this->Time->isThisWeek("-6 days"));
-				break;
-			case 'Sun' :
-				for ($i = -6; $i < 1; $i++) {
-					$this->assertTrue($this->Time->isThisWeek("+$i days"));
-				}
-				$this->assertFalse($this->Time->isThisWeek("+1 days"));
-				$this->assertFalse($this->Time->isThisWeek("-7 days"));
-				break;
+		// A map of days which goes from -1 day of week to +1 day of week
+		$map = array(
+			'Mon' => array(-1, 7), 'Tue' => array(-2, 6), 'Wed' => array(-3, 5),
+			'Thu' => array(-4, 4), 'Fri' => array(-5, 3), 'Sat' => array(-6, 2),
+			'Sun' => array(-7, 1)
+		);
+		$days = $map[date('D')];
+
+		for ($day = $days[0] + 1; $day < $days[1]; $day++) {
+			$this->assertTrue($this->Time->isThisWeek(($day > 0 ? '+' : '') . $day . ' days'));
 		}
+		$this->assertFalse($this->Time->isThisWeek($days[0] . ' days'));
+		$this->assertFalse($this->Time->isThisWeek('+' . $days[1] . ' days'));
 	}
 /**
  * testIsThisMonth method

From 3dbae37aadc903f380647d9454e25635d3e560ab Mon Sep 17 00:00:00 2001
From: ceeram <mayl@planet.nl>
Date: Thu, 22 Oct 2009 12:34:25 +0200
Subject: [PATCH 056/244] fixing failing i18n testcase, caused by setting
 $category parameter for __c(), __dc() and __dcn() as LC_MONETARY instead of
 numeric value

---
 cake/tests/cases/libs/i18n.test.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cake/tests/cases/libs/i18n.test.php b/cake/tests/cases/libs/i18n.test.php
index 3aa5b2f57..01b271871 100644
--- a/cake/tests/cases/libs/i18n.test.php
+++ b/cake/tests/cases/libs/i18n.test.php
@@ -2557,7 +2557,7 @@ function testCategoryThenSingular() {
  * @access private
  * @return void
  */
-	function __domainCategorySingular($domain = 'test_plugin', $category = LC_MONETARY) {
+	function __domainCategorySingular($domain = 'test_plugin', $category = 3) {
 		$singular = __dc($domain, 'Plural Rule 1', $category, true);
 		return $singular;
 	}
@@ -2567,7 +2567,7 @@ function __domainCategorySingular($domain = 'test_plugin', $category = LC_MONETA
  * @access private
  * @return void
  */
-	function __domainCategoryPlural($domain = 'test_plugin', $category = LC_MONETARY) {
+	function __domainCategoryPlural($domain = 'test_plugin', $category = 3) {
 		$plurals = array();
 		for ($number = 0; $number <= 25; $number++) {
 			$plurals[] =  sprintf(__dcn($domain, '%d = 1', '%d = 0 or > 1', (float)$number, $category, true), (float)$number);
@@ -2603,7 +2603,7 @@ function __domainPlural($domain = 'test_plugin') {
  * @access private
  * @return void
  */
-	function __category($category = LC_MONETARY) {
+	function __category($category = 3) {
 		$singular = __c('Plural Rule 1', $category, true);
 		return $singular;
 	}

From d25497c52702e0962b85bc6f5692a948d0dbd17e Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 22 Oct 2009 13:51:55 -0400
Subject: [PATCH 057/244] Adding Skip to mb_strrpos test case.  Skips the test
 if mbstring is installed and php version is 5.1.x.  mb_strrpos had an
 incompatible function signature in these versions.

---
 cake/tests/cases/libs/multibyte.test.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cake/tests/cases/libs/multibyte.test.php b/cake/tests/cases/libs/multibyte.test.php
index 68950cc78..dd0ea371c 100644
--- a/cake/tests/cases/libs/multibyte.test.php
+++ b/cake/tests/cases/libs/multibyte.test.php
@@ -4786,6 +4786,10 @@ function testMultibyteStrripos() {
  * @return void
  */
 	function testUsingMbStrrpos() {
+		$skip = extension_loaded('mbstring') && version_compare(PHP_VERSION, '5.2.0', '<');
+		if ($this->skipIf($skip, '%s PHP version does not support $offset parameter in mb_strrpos().')) {
+			return;
+		}
 		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
 		$find = 'F';
 		$result = mb_strrpos($string, $find);

From c6999aea7f66bad6bd98e460351e045a0a6d4374 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 24 Oct 2009 10:46:28 -0400
Subject: [PATCH 058/244] Moving DboMysqli::describe() and DboMysql::describe()
 into DboMysqlBase.  Removes duplicated method code.

---
 cake/libs/model/datasources/dbo/dbo_mysql.php | 68 +++++++++----------
 .../libs/model/datasources/dbo/dbo_mysqli.php | 37 ----------
 2 files changed, 34 insertions(+), 71 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index 58433beca..ef61cb675 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -85,6 +85,40 @@ class DboMysqlBase extends DboSource {
 		'binary' => array('name' => 'blob'),
 		'boolean' => array('name' => 'tinyint', 'limit' => '1')
 	);
+/**
+ * Returns an array of the fields in given table name.
+ *
+ * @param string $tableName Name of database table to inspect
+ * @return array Fields in table. Keys are name and type
+ */
+	function describe(&$model) {
+		$cache = parent::describe($model);
+		if ($cache != null) {
+			return $cache;
+		}
+		$fields = false;
+		$cols = $this->query('DESCRIBE ' . $this->fullTableName($model));
+
+		foreach ($cols as $column) {
+			$colKey = array_keys($column);
+			if (isset($column[$colKey[0]]) && !isset($column[0])) {
+				$column[0] = $column[$colKey[0]];
+			}
+			if (isset($column[0])) {
+				$fields[$column[0]['Field']] = array(
+					'type' => $this->column($column[0]['Type']),
+					'null' => ($column[0]['Null'] == 'YES' ? true : false),
+					'default' => $column[0]['Default'],
+					'length' => $this->length($column[0]['Type']),
+				);
+				if (!empty($column[0]['Key']) && isset($this->index[$column[0]['Key']])) {
+					$fields[$column[0]['Field']]['key'] = $this->index[$column[0]['Key']];
+				}
+			}
+		}
+		$this->__cacheDescription($this->fullTableName($model, false), $fields);
+		return $fields;
+	}
 /**
  * Generates and executes an SQL UPDATE statement for given model, fields, and values.
  *
@@ -442,40 +476,6 @@ function listSources() {
 			return $tables;
 		}
 	}
-/**
- * Returns an array of the fields in given table name.
- *
- * @param string $tableName Name of database table to inspect
- * @return array Fields in table. Keys are name and type
- */
-	function describe(&$model) {
-		$cache = parent::describe($model);
-		if ($cache != null) {
-			return $cache;
-		}
-		$fields = false;
-		$cols = $this->query('DESCRIBE ' . $this->fullTableName($model));
-
-		foreach ($cols as $column) {
-			$colKey = array_keys($column);
-			if (isset($column[$colKey[0]]) && !isset($column[0])) {
-				$column[0] = $column[$colKey[0]];
-			}
-			if (isset($column[0])) {
-				$fields[$column[0]['Field']] = array(
-					'type'		=> $this->column($column[0]['Type']),
-					'null'		=> ($column[0]['Null'] == 'YES' ? true : false),
-					'default'	=> $column[0]['Default'],
-					'length'	=> $this->length($column[0]['Type']),
-				);
-				if (!empty($column[0]['Key']) && isset($this->index[$column[0]['Key']])) {
-					$fields[$column[0]['Field']]['key']	= $this->index[$column[0]['Key']];
-				}
-			}
-		}
-		$this->__cacheDescription($this->fullTableName($model, false), $fields);
-		return $fields;
-	}
 /**
  * Returns a quoted and escaped string of $data for use in an SQL statement.
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index bf9797d43..910504082 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -157,43 +157,6 @@ function listSources() {
 		parent::listSources($tables);
 		return $tables;
 	}
-/**
- * Returns an array of the fields in given table name.
- *
- * @param string $tableName Name of database table to inspect
- * @return array Fields in table. Keys are name and type
- */
-	function describe(&$model) {
-
-		$cache = parent::describe($model);
-		if ($cache != null) {
-			return $cache;
-		}
-
-		$fields = false;
-		$cols = $this->query('DESCRIBE ' . $this->fullTableName($model));
-
-		foreach ($cols as $column) {
-			$colKey = array_keys($column);
-			if (isset($column[$colKey[0]]) && !isset($column[0])) {
-				$column[0] = $column[$colKey[0]];
-			}
-			if (isset($column[0])) {
-				$fields[$column[0]['Field']] = array(
-					'type'		=> $this->column($column[0]['Type']),
-					'null'		=> ($column[0]['Null'] == 'YES' ? true : false),
-					'default'	=> $column[0]['Default'],
-					'length'	=> $this->length($column[0]['Type'])
-				);
-				if (!empty($column[0]['Key']) && isset($this->index[$column[0]['Key']])) {
-					$fields[$column[0]['Field']]['key']	= $this->index[$column[0]['Key']];
-				}
-			}
-		}
-
-		$this->__cacheDescription($this->fullTableName($model, false), $fields);
-		return $fields;
-	}
 /**
  * Returns a quoted and escaped string of $data for use in an SQL statement.
  *

From 14bd47842ca767571596a1be159356dd8f66fb60 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 24 Oct 2009 11:06:27 -0400
Subject: [PATCH 059/244] Removing length() from DboMysqli, fixes incorrect
 float length parsing. Test case added.

---
 .../libs/model/datasources/dbo/dbo_mysqli.php | 19 ----------------
 .../model/datasources/dbo/dbo_mysqli.test.php | 22 ++++++++++++++-----
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index 910504082..2742a7c31 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -298,25 +298,6 @@ function column($real) {
 		}
 		return 'text';
 	}
-/**
- * Gets the length of a database-native column description, or null if no length
- *
- * @param string $real Real database-layer column type (i.e. "varchar(255)")
- * @return integer An integer representing the length of the column
- */
-	function length($real) {
-		$col = str_replace(array(')', 'unsigned'), '', $real);
-		$limit = null;
-	
-		if (strpos($col, '(') !== false) {
-			list($col, $limit) = explode('(', $col);
-		}
-	
-		if ($limit != null) {
-			return intval($limit);
-		}
-		return null;
-	}
 /**
  * Enter description here...
  *
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
index 3b19174c4..2e1e87a66 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
@@ -154,6 +154,7 @@ function schema() {
  * @subpackage    cake.tests.cases.libs.model.datasources.dbo
  */
 class DboMysqliTest extends CakeTestCase {
+	var $fixtures = array('core.datatype');
 /**
  * The Dbo instance to be tested
  *
@@ -176,8 +177,6 @@ function skip() {
  * @access public
  */
 	function setUp() {
-		$db = ConnectionManager::getDataSource('test_suite');
-		$this->db = new DboMysqliTestDb($db->config);
 		$this->model = new MysqliTestModel();
 	}
 /**
@@ -186,7 +185,8 @@ function setUp() {
  * @access public
  */
 	function tearDown() {
-		unset($this->db);
+		unset($this->model);
+		ClassRegistry::flush();
 	}
 /**
  * testIndexDetection method
@@ -195,7 +195,7 @@ function tearDown() {
  * @access public
  */
 	function testIndexDetection() {
-		$this->db->cacheSources = $this->db->testing = false;
+		$this->db->cacheSources = false;
 
 		$name = $this->db->fullTableName('simple');
 		$this->db->query('CREATE TABLE ' . $name . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id));');
@@ -298,12 +298,14 @@ function testColumn() {
 		$this->assertEqual($result, $expected);
 	}
 /**
- * undocumented function
+ * test mysqli transactions
  *
  * @return void
  * @access public
  */
 	function testTransactions() {
+		$this->db->cacheSources = false;
+
 		$this->db->begin($this->model);
 		$this->assertTrue($this->db->_transactionStarted);
 
@@ -313,5 +315,15 @@ function testTransactions() {
 		$this->db->commit($this->model);
 		$this->assertFalse($this->db->_transactionStarted);
 	}
+/**
+ * test that float values are correctly identified
+ *
+ * @return void
+ **/
+	function testFloatParsing() {
+		$model =& new Model(array('ds' => 'test_suite', 'table' => 'datatypes', 'name' => 'Datatype'));
+		$result = $this->db->describe($model);
+		$this->assertEqual((string)$result['float_field']['length'], '5,2');
+	}
 }
 ?>
\ No newline at end of file

From 72830cb125204f27b7055c8d8f41fa9bfef1a808 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 24 Oct 2009 11:26:06 -0400
Subject: [PATCH 060/244] Adding test case for model task Fixing missing case
 for float datatypes when generating fixtures. Fixes #204

---
 cake/console/libs/tasks/model.php             |  6 +-
 .../cases/console/libs/tasks/model.test.php   | 90 +++++++++++++++++++
 2 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 cake/tests/cases/console/libs/tasks/model.test.php

diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index 779d088f8..2d75be9ba 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -99,6 +99,7 @@ function __interactive() {
 		if (count($connections) > 1) {
 			$useDbConfig = $this->in(__('Use Database Config', true) .':', $connections, 'default');
 		}
+		$this->useDbConfig = $useDbConfig;
 
 		$currentModelName = $this->getName($useDbConfig);
 		$db =& ConnectionManager::getDataSource($useDbConfig);
@@ -843,7 +844,7 @@ function fixture($model, $useTable = null) {
 			$out .= "\tvar \$table = '$useTable';\n";
 		}
 		$schema = new CakeSchema();
-		$data = $schema->read(array('models' => false));
+		$data = $schema->read(array('models' => false, 'connection' => $this->useDbConfig));
 
 		if (!isset($data['tables'][$useTable])) {
 			return false;
@@ -865,6 +866,7 @@ function fixture($model, $useTable = null) {
 							$col = "\t\t'{$field}' => array('type'=>'" . $value['type'] . "', ";
 
 							switch ($value['type']) {
+								case 'float':
 								case 'integer':
 									$insert = 1;
 								break;
@@ -898,7 +900,7 @@ function fixture($model, $useTable = null) {
 									$insert .= "feugiat in taciti enim proin nibh, tempor dignissim, rhoncus duis vestibulum nunc mattis convallis.'";
 								break;
 							}
-							$records[] = "\t\t'$field'  => $insert";
+							$records[] = "\t\t'$field' => $insert";
 							unset($value['type']);
 							$col .= join(', ',  $schema->__values($value));
 						} else {
diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php
new file mode 100644
index 000000000..b273b69cc
--- /dev/null
+++ b/cake/tests/cases/console/libs/tasks/model.test.php
@@ -0,0 +1,90 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * ModelTaskTest file
+ *
+ * Test Case for test generation shell task
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2006-2009, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2009, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP v 1.2.6
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+App::import('Core', 'Shell');
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+if (!class_exists('TestTask')) {
+	require CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'model.php';
+}
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestModelTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+Mock::generatePartial(
+	'ModelTask', 'MockModelTask',
+	array('in', 'out', 'createFile')
+);
+/**
+ * ModelTaskTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class ModelTaskTest extends CakeTestCase {
+	var $fixtures = array('core.datatype');
+/**
+ * setUp method
+ *
+ * @return void
+ * @access public
+ */
+	function setUp() {
+		$this->Dispatcher =& new TestModelTaskMockShellDispatcher();
+		$this->Task =& new MockModelTask($this->Dispatcher);
+		$this->Task->Dispatch =& $this->Dispatcher;
+	}
+/**
+ * tearDown method
+ *
+ * @return void
+ * @access public
+ */
+	function tearDown() {
+		ClassRegistry::flush();
+	}
+/**
+ * test fixture generation with floats
+ *
+ * @return void
+ **/
+	function testFixtureGeneration() {
+		$this->Task->useDbConfig = 'test_suite';
+		$this->Task->setReturnValue('createFile', true);
+		$result = $this->Task->fixture('Datatype');
+		$this->assertPattern('/float_field\' => 1/', $result);
+		
+	}
+}
+?>
\ No newline at end of file

From 79fdd8b341437287549ace1f413bd495e6db8d3e Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 24 Oct 2009 12:53:22 -0400
Subject: [PATCH 061/244] Adding test to ensure blob integrity.  Disproves #199

---
 .../model/datasources/dbo/dbo_mysql.test.php  | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
index cf9cc833c..26a9bc9c0 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
@@ -153,6 +153,7 @@ function schema() {
  * @subpackage    cake.tests.cases.libs.model.datasources.dbo
  */
 class DboMysqlTest extends CakeTestCase {
+	var $fixtures = array('core.binary_test');
 /**
  * The Dbo instance to be tested
  *
@@ -176,7 +177,6 @@ function skip() {
  */
 	function setUp() {
 		$db = ConnectionManager::getDataSource('test_suite');
-		$this->db = new DboMysqlTestDb($db->config);
 		$this->model = new MysqlTestModel();
 	}
 /**
@@ -185,7 +185,8 @@ function setUp() {
  * @access public
  */
 	function tearDown() {
-		unset($this->db);
+		unset($this->model);
+		ClassRegistry::flush();
 	}
 /**
  * startCase
@@ -269,7 +270,7 @@ function testQuoting() {
  * @return void
  */
 	function testTinyintCasting() {
-		$this->db->cacheSources = $this->db->testing = false;
+		$this->db->cacheSources = false;
 		$this->db->query('CREATE TABLE ' . $this->db->fullTableName('tinyint') . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id));');
 
 		$this->model = new CakeTestModel(array(
@@ -307,7 +308,7 @@ function testTinyintCasting() {
  * @access public
  */
 	function testIndexDetection() {
-		$this->db->cacheSources = $this->db->testing = false;
+		$this->db->cacheSources = false;
 
 		$name = $this->db->fullTableName('simple');
 		$this->db->query('CREATE TABLE ' . $name . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id));');
@@ -510,7 +511,7 @@ function testColumn() {
  */
 	function testAlterSchemaIndexes() {
 		App::import('Core', 'Schema');
-		$this->db->cacheSources = $this->db->testing = false;
+		$this->db->cacheSources = false;
 
 		$schema1 =& new CakeSchema(array(
 			'name' => 'AlterTest1',
@@ -574,5 +575,23 @@ function testAlterSchemaIndexes() {
 
 		$this->db->query($this->db->dropSchema($schema1));
 	}
+/**
+ * test saving and retrieval of blobs
+ *
+ * @return void
+ **/
+	function testBlobSaving() {
+		$this->db->cacheSources = false;
+		$data = "GIF87ab
+		Ò4A¿¿¿ˇˇˇ,b
+		¢îè©ÀÌ#¥⁄ã≥fi:¯Ü‚Héá¶jV∂ÓúÎL≥çÀóËıÎ…>ï≈ vFE%ÒâLFI<†µw˝±≈£7˘ç^H“≤«>Éâ*∑ÇnÖA•Ù|flêèj£:=ÿ6óUàµ5'∂®àA¬ñ∆ˆGE(gt’≈àÚyÁó«7	‚VìöÇ√˙Ç™
+		k”:;kÀAõ{*¡€Î˚˚[;;";
+
+		$model =& new AppModel(array('name' => 'BinaryTest', 'ds' => 'test_suite'));
+		$model->save(compact('data'));
+
+		$result = $model->find('first');
+		$this->assertEqual($result['BinaryTest']['data'], $data);
+	}
 }
 ?>
\ No newline at end of file

From 5a093e56272d614c7bb33adee0eb4dfd3cc701c1 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 27 Oct 2009 13:22:34 -0400
Subject: [PATCH 062/244] Fixing issues in postgres with time columns and ''
 values. Tests added. Fixes #213

---
 cake/libs/model/datasources/dbo/dbo_postgres.php           | 1 +
 .../cases/libs/model/datasources/dbo/dbo_postgres.test.php | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index 192355fd6..3ea5d8fa0 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -286,6 +286,7 @@ function value($data, $column = null, $read = true) {
 			case 'date':
 			case 'datetime':
 			case 'timestamp':
+			case 'time':
 				if ($data === '') {
 					return $read ? 'NULL' : 'DEFAULT';
 				}
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
index aec59ba4c..ff6588668 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
@@ -291,11 +291,11 @@ function testValueQuoting() {
 		$this->assertEqual($this->db2->value(null, 'boolean'), "NULL");
 	}
 /**
- * test that date columns do not generate errors with null and nullish values.
+ * test that date and time columns do not generate errors with null and nullish values.
  *
  * @return void
  **/
-	function testDateAsNull() {
+	function testDateAndTimeAsNull() {
 		$this->assertEqual($this->db2->value(null, 'date'), 'NULL');
 		$this->assertEqual($this->db2->value('', 'date'), 'NULL');
 
@@ -304,6 +304,9 @@ function testDateAsNull() {
 
 		$this->assertEqual($this->db2->value('', 'timestamp'), 'NULL');
 		$this->assertEqual($this->db2->value(null, 'timestamp'), 'NULL');
+
+		$this->assertEqual($this->db2->value('', 'time'), 'NULL');
+		$this->assertEqual($this->db2->value(null, 'time'), 'NULL');
 	}
 /**
  * Tests that different Postgres boolean 'flavors' are properly returned as native PHP booleans

From 00d7c655ce57fd9b33250e3ba10441604a89bd87 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 27 Oct 2009 13:28:43 -0400
Subject: [PATCH 063/244] Improving documentation for PaginatorHelper::sort()
 Fixes #210

---
 cake/libs/view/helpers/paginator.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 7b5dd09a2..0e8505ecf 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -207,11 +207,13 @@ function next($title = 'Next >>', $options = array(), $disabledTitle = null, $di
 		return $this->__pagingLink('Next', $title, $options, $disabledTitle, $disabledOptions);
 	}
 /**
- * Generates a sorting link
+ * Generates a sorting link. Sets named parameters for the sort and direction.  Handles
+ * direction switching automatically.
  *
- * @param  string $title Title for the link.
- * @param  string $key The name of the key that the recordset should be sorted.
- * @param  array $options Options for sorting link. See #options for list of keys.
+ * @param string $title Title for the link.
+ * @param string $key The name of the key that the recordset should be sorted.  If $key is null
+ *   $title will be used for the key, and a title will be generated by inflection.
+ * @param array $options Options for sorting link. See #options for list of keys.
  * @return string A link sorting default by 'asc'. If the resultset is sorted 'asc' by the specified
  *  key the returned link will sort by 'desc'.
  */

From 23ab84596aa2083acea08d7b33e275f4322b7f2b Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 27 Oct 2009 21:04:14 -0400
Subject: [PATCH 064/244] Adding discrete tests to Folder::addPathElement

---
 cake/tests/cases/libs/folder.test.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cake/tests/cases/libs/folder.test.php b/cake/tests/cases/libs/folder.test.php
index 6fad570de..0793630c2 100644
--- a/cake/tests/cases/libs/folder.test.php
+++ b/cake/tests/cases/libs/folder.test.php
@@ -215,6 +215,18 @@ function testZeroAsDirectory() {
 		$result = $Folder->delete($new);
 		$this->assertTrue($result);
 	}
+/**
+ * test Adding path elements to a path
+ *
+ * @return void
+ **/
+	function testAddPathElement() {
+		$result = Folder::addPathElement(DS . 'some' . DS . 'dir', 'another_path');
+		$this->assertEqual($result, DS . 'some' . DS . 'dir' . DS . 'another_path');
+
+		$result = Folder::addPathElement(DS . 'some' . DS . 'dir' . DS, 'another_path');
+		$this->assertEqual($result, DS . 'some' . DS . 'dir' . DS . 'another_path');
+	}
 /**
  * testFolderRead method
  *

From ad305a890a9854f55b6da97d734f6e738a024066 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 27 Oct 2009 21:06:58 -0400
Subject: [PATCH 065/244] Applying optimization from 'ermayer'  Reduces
 functions called from Folder::addPathElement() Fixes #178

---
 cake/libs/folder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/folder.php b/cake/libs/folder.php
index 28f32672a..a5331f80f 100644
--- a/cake/libs/folder.php
+++ b/cake/libs/folder.php
@@ -302,7 +302,7 @@ function slashTerm($path) {
  * @static
  */
 	function addPathElement($path, $element) {
-		return Folder::slashTerm($path) . $element;
+		return rtrim($path, DS) . DS . $element;
 	}
 /**
  * Returns true if the File is in a given CakePath.

From a31a2d264c2cd128de2db839fa2901680c7de2ba Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 29 Oct 2009 19:47:29 -0400
Subject: [PATCH 066/244] Fixing Debugger::log() .  The method used protected
 properties only available in test cases.  No stack trace was being logged
 when called either. Method has been updated to match its doc block better.
 Fixes #222

---
 cake/libs/debugger.php                  | 12 ++----------
 cake/tests/cases/libs/debugger.test.php |  1 +
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php
index 1e942e5f6..a49b39abb 100644
--- a/cake/libs/debugger.php
+++ b/cake/libs/debugger.php
@@ -139,16 +139,8 @@ function dump($var) {
  */
 	function log($var, $level = LOG_DEBUG) {
 		$_this = Debugger::getInstance();
-		$trace = $_this->trace(array('start' => 1, 'depth' => 2, 'format' => 'array'));
-		$source = null;
-
-		if (is_object($trace[0]['object']) && isset($trace[0]['object']->_reporter->_test_stack)) {
-			$stack = $trace[0]['object']->_reporter->_test_stack;
-			$source = sprintf('[%1$s, %3$s::%2$s()]' . "\n",
-								array_shift($stack), array_pop($stack), array_pop($stack));
-		}
-
-		CakeLog::write($level, $source . $_this->exportVar($var));
+		$source = $_this->trace(array('start' => 1)) . "\n";
+		CakeLog::write($level, "\n" . $source . $_this->exportVar($var));
 	}
 
 /**
diff --git a/cake/tests/cases/libs/debugger.test.php b/cake/tests/cases/libs/debugger.test.php
index 6f1f0162c..8f57cbbd0 100644
--- a/cake/tests/cases/libs/debugger.test.php
+++ b/cake/tests/cases/libs/debugger.test.php
@@ -226,6 +226,7 @@ function testLog() {
 		Debugger::log(array('whatever', 'here'));
 		$result = file_get_contents(TMP . 'logs' . DS . 'debug.log');
 		$this->assertPattern('/DebuggerTest\:\:testLog/', $result);
+		$this->assertPattern('/\[main\]/', $result);
 		$this->assertPattern('/array/', $result);
 		$this->assertPattern('/"whatever",/', $result);
 		$this->assertPattern('/"here"/', $result);

From 17edec84607ad1a347113278bddc3eed988c5e21 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 29 Oct 2009 20:14:36 -0400
Subject: [PATCH 067/244] Changin how HttpSocket parses query string
 parameters.  Makes HttpSocket querystring parameter parsing more congruent
 with how PHP handles query string parameters in that it doesn't require
 urlencoded characters. Tests added. Fixes #156

---
 cake/libs/http_socket.php                  |  2 +-
 cake/tests/cases/libs/http_socket.test.php | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index 76d12d710..793618ece 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -672,7 +672,7 @@ function parseQuery($query) {
 
 			foreach ($items as $item) {
 				if (strpos($item, '=') !== false) {
-					list($key, $value) = explode('=', $item);
+					list($key, $value) = explode('=', $item, 2);
 				} else {
 					$key = $item;
 					$value = null;
diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php
index b3fa948b1..2dbc193d9 100644
--- a/cake/tests/cases/libs/http_socket.test.php
+++ b/cake/tests/cases/libs/http_socket.test.php
@@ -878,6 +878,28 @@ function testParseUri() {
 			'host' => 'www.google.com',
 			'port' => 8080,
 		));
+
+		$uri = $this->Socket->parseUri('http://www.cakephp.org/?param1=value1&param2=value2%3Dvalue3');
+		$this->assertIdentical($uri, array(
+			'scheme' => 'http',
+			'host' => 'www.cakephp.org',
+			'path' => '/',
+			'query' => array(
+				'param1' => 'value1',
+				'param2' => 'value2=value3'
+			)
+		));
+
+		$uri = $this->Socket->parseUri('http://www.cakephp.org/?param1=value1&param2=value2=value3');
+		$this->assertIdentical($uri, array(
+			'scheme' => 'http',
+			'host' => 'www.cakephp.org',
+			'path' => '/',
+			'query' => array(
+				'param1' => 'value1',
+				'param2' => 'value2=value3'
+			)
+		));
 	}
 /**
  * Tests that HttpSocket::buildUri can turn all kinds of uri arrays (and strings) into fully or partially qualified URI's

From 2e3bbe363dde2bfab61f783d4adea78d839e618c Mon Sep 17 00:00:00 2001
From: Gordon Pettey <petteyg359@gmail.com>
Date: Fri, 30 Oct 2009 16:30:11 -0400
Subject: [PATCH 068/244] Array coding convention and extraneous punctuation

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/console/libs/tasks/controller.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index 736522a84..efc363106 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -267,10 +267,10 @@ function bakeActions($controllerName, $admin = null, $wannaUseSession = true) {
 		$actions .= "\tfunction {$admin}view(\$id = null) {\n";
 		$actions .= "\t\tif (!\$id) {\n";
 		if ($wannaUseSession) {
-			$actions .= "\t\t\t\$this->Session->setFlash(__('Invalid {$singularHumanName}.', true));\n";
-			$actions .= "\t\t\t\$this->redirect(array('action'=>'index'));\n";
+			$actions .= "\t\t\t\$this->Session->setFlash(__('Invalid {$singularHumanName}', true));\n";
+			$actions .= "\t\t\t\$this->redirect(array('action' => 'index'));\n";
 		} else {
-			$actions .= "\t\t\t\$this->flash(__('Invalid {$singularHumanName}', true), array('action'=>'index'));\n";
+			$actions .= "\t\t\t\$this->flash(__('Invalid {$singularHumanName}', true), array('action' => 'index'));\n";
 		}
 		$actions .= "\t\t}\n";
 		$actions .= "\t\t\$this->set('" . $singularName . "', \$this->{$currentModelName}->read(null, \$id));\n";
@@ -285,9 +285,9 @@ function bakeActions($controllerName, $admin = null, $wannaUseSession = true) {
 		$actions .= "\t\t\tif (\$this->{$currentModelName}->save(\$this->data)) {\n";
 		if ($wannaUseSession) {
 			$actions .= "\t\t\t\t\$this->Session->setFlash(__('The " . $singularHumanName . " has been saved', true));\n";
-			$actions .= "\t\t\t\t\$this->redirect(array('action'=>'index'));\n";
+			$actions .= "\t\t\t\t\$this->redirect(array('action' => 'index'));\n";
 		} else {
-			$actions .= "\t\t\t\t\$this->flash(__('{$currentModelName} saved.', true), array('action'=>'index'));\n";
+			$actions .= "\t\t\t\t\$this->flash(__('{$currentModelName} saved.', true), array('action' => 'index'));\n";
 		}
 		$actions .= "\t\t\t} else {\n";
 		if ($wannaUseSession) {
@@ -324,18 +324,18 @@ function bakeActions($controllerName, $admin = null, $wannaUseSession = true) {
 		$actions .= "\t\tif (!\$id && empty(\$this->data)) {\n";
 		if ($wannaUseSession) {
 			$actions .= "\t\t\t\$this->Session->setFlash(__('Invalid {$singularHumanName}', true));\n";
-			$actions .= "\t\t\t\$this->redirect(array('action'=>'index'));\n";
+			$actions .= "\t\t\t\$this->redirect(array('action' => 'index'));\n";
 		} else {
-			$actions .= "\t\t\t\$this->flash(__('Invalid {$singularHumanName}', true), array('action'=>'index'));\n";
+			$actions .= "\t\t\t\$this->flash(__('Invalid {$singularHumanName}', true), array('action' => 'index'));\n";
 		}
 		$actions .= "\t\t}\n";
 		$actions .= "\t\tif (!empty(\$this->data)) {\n";
 		$actions .= "\t\t\tif (\$this->{$currentModelName}->save(\$this->data)) {\n";
 		if ($wannaUseSession) {
 			$actions .= "\t\t\t\t\$this->Session->setFlash(__('The " . $singularHumanName . " has been saved', true));\n";
-			$actions .= "\t\t\t\t\$this->redirect(array('action'=>'index'));\n";
+			$actions .= "\t\t\t\t\$this->redirect(array('action' => 'index'));\n";
 		} else {
-			$actions .= "\t\t\t\t\$this->flash(__('The " . $singularHumanName . " has been saved.', true), array('action'=>'index'));\n";
+			$actions .= "\t\t\t\t\$this->flash(__('The " . $singularHumanName . " has been saved.', true), array('action' => 'index'));\n";
 		}
 		$actions .= "\t\t\t} else {\n";
 		if ($wannaUseSession) {
@@ -373,17 +373,17 @@ function bakeActions($controllerName, $admin = null, $wannaUseSession = true) {
 		$actions .= "\t\tif (!\$id) {\n";
 		if ($wannaUseSession) {
 			$actions .= "\t\t\t\$this->Session->setFlash(__('Invalid id for {$singularHumanName}', true));\n";
-			$actions .= "\t\t\t\$this->redirect(array('action'=>'index'));\n";
+			$actions .= "\t\t\t\$this->redirect(array('action' => 'index'));\n";
 		} else {
-			$actions .= "\t\t\t\$this->flash(__('Invalid {$singularHumanName}', true), array('action'=>'index'));\n";
+			$actions .= "\t\t\t\$this->flash(__('Invalid {$singularHumanName}', true), array('action' => 'index'));\n";
 		}
 		$actions .= "\t\t}\n";
 		$actions .= "\t\tif (\$this->{$currentModelName}->del(\$id)) {\n";
 		if ($wannaUseSession) {
 			$actions .= "\t\t\t\$this->Session->setFlash(__('{$singularHumanName} deleted', true));\n";
-			$actions .= "\t\t\t\$this->redirect(array('action'=>'index'));\n";
+			$actions .= "\t\t\t\$this->redirect(array('action' => 'index'));\n";
 		} else {
-			$actions .= "\t\t\t\$this->flash(__('{$singularHumanName} deleted', true), array('action'=>'index'));\n";
+			$actions .= "\t\t\t\$this->flash(__('{$singularHumanName} deleted', true), array('action' => 'index'));\n";
 		}
 		$actions .= "\t\t}\n";
 		$actions .= "\t}\n";

From 84a10904fb158a2f5ebbdc8e04ab06ad117138c5 Mon Sep 17 00:00:00 2001
From: "renan.saddam" <renan.saddam@gmail.com>
Date: Fri, 30 Oct 2009 18:42:04 -0200
Subject: [PATCH 069/244] Fixing typo on variable name.

---
 cake/libs/configure.php          |  2 +-
 cake/libs/view/helpers/cache.php | 29 +++++++++++++----------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 30aeaf56b..05cb2875e 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -254,7 +254,7 @@ function __list($path, $suffix = false, $extension = false) {
  *     'key1' => 'value of the Configure::One[key1]',
  *     'key2' => 'value of the Configure::One[key2]'
  * );
- * 
+ *
  * Configure::write(array(
  *     'One.key1' => 'value of the Configure::One[key1]',
  *     'One.key2' => 'value of the Configure::One[key2]'
diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php
index afbf0ce57..8f43ecf9e 100644
--- a/cake/libs/view/helpers/cache.php
+++ b/cake/libs/view/helpers/cache.php
@@ -74,15 +74,15 @@ function cache($file, $out, $cache = false) {
 		$cacheTime = 0;
 		$useCallbacks = false;
 		if (is_array($this->cacheAction)) {
-			$contoller = Inflector::underscore($this->controllerName);
+			$controller = Inflector::underscore($this->controllerName);
 			$check = str_replace('/', '_', $this->here);
 			$replace = str_replace('/', '_', $this->base);
 			$match = str_replace($this->base, '', $this->here);
 			$match = str_replace('//', '/', $match);
-			$match = str_replace('/' . $contoller . '/', '', $match);
+			$match = str_replace('/' . $controller . '/', '', $match);
 			$match = str_replace('/' . $this->controllerName . '/', '', $match);
 			$check = str_replace($replace, '', $check);
-			$check = str_replace('_' . $contoller . '_', '', $check);
+			$check = str_replace('_' . $controller . '_', '', $check);
 			$check = str_replace('_' . $this->controllerName . '_', '', $check);
 			$check = Inflector::slug($check);
 			$check = preg_replace('/^_+/', '', $check);
@@ -171,7 +171,6 @@ function __parseFile($file, $cache) {
 			$outputResult = array_values($outputResult);
 		}
 
-
 		if (!empty($fileResult)) {
 			$i = 0;
 			foreach ($fileResult as $cacheBlock) {
@@ -193,24 +192,23 @@ function __parseFile($file, $cache) {
 	function __parseOutput($cache) {
 		$count = 0;
 		if (!empty($this->__match)) {
-
 			foreach ($this->__match as $found) {
 				$original = $cache;
 				$length = strlen($found);
 				$position = 0;
 
-					for ($i = 1; $i <= 1; $i++) {
-						$position = strpos($cache, $found, $position);
+				for ($i = 1; $i <= 1; $i++) {
+					$position = strpos($cache, $found, $position);
 
-						if ($position !== false) {
-							$cache = substr($original, 0, $position);
-							$cache .= $this->__replace[$count];
-							$cache .= substr($original, $position + $length);
-						} else {
-							break;
-						}
+					if ($position !== false) {
+						$cache = substr($original, 0, $position);
+						$cache .= $this->__replace[$count];
+						$cache .= substr($original, $position + $length);
+					} else {
+						break;
 					}
-					$count++;
+				}
+				$count++;
 			}
 			return $cache;
 		}
@@ -291,5 +289,4 @@ function __writeFile($content, $timestamp, $useCallbacks = false) {
 		return cache('views' . DS . $cache, $file, $timestamp);
 	}
 }
-
 ?>
\ No newline at end of file

From a91970b7b221628d7398f19286509222e33df666 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 31 Oct 2009 13:41:16 -0400
Subject: [PATCH 070/244] Fixing security component test failures when run as
 part of a group.

---
 cake/tests/cases/libs/controller/components/security.test.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php
index f744f2dce..0aa80c393 100644
--- a/cake/tests/cases/libs/controller/components/security.test.php
+++ b/cake/tests/cases/libs/controller/components/security.test.php
@@ -202,6 +202,7 @@ function testRequirePostSucceed() {
  * @return void
  */
 	function testRequireSecureFail() {
+		$_SERVER['HTTPS'] = 'off';
 		$_SERVER['REQUEST_METHOD'] = 'POST';
 		$this->Controller->action = 'posted';
 		$this->Controller->Security->requireSecure('posted');

From 59566d4587fe365c6ddb215c3b06575d5c92de2e Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 31 Oct 2009 14:08:56 -0400
Subject: [PATCH 071/244] Updating component test case to no fail in group
 test. Updating controller group to only run controller classes.

---
 .../cases/libs/controller/component.test.php   | 18 +++++++++++++++---
 cake/tests/groups/controller.group.php         |  7 +++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/cake/tests/cases/libs/controller/component.test.php b/cake/tests/cases/libs/controller/component.test.php
index e3f78b28c..8ab7227c2 100644
--- a/cake/tests/cases/libs/controller/component.test.php
+++ b/cake/tests/cases/libs/controller/component.test.php
@@ -353,6 +353,7 @@ function testLoadComponents() {
 	function testNestedComponentLoading() {
 		$Controller =& new ComponentTestController();
 		$Controller->components = array('Apple');
+		$Controller->uses = false;
 		$Controller->constructClasses();
 		$Controller->Component->initialize($Controller);
 
@@ -372,6 +373,7 @@ function testNestedComponentLoading() {
 	function testComponentStartup() {
 		$Controller =& new ComponentTestController();
 		$Controller->components = array('Apple');
+		$Controller->uses = false;
 		$Controller->constructClasses();
 		$Controller->Component->initialize($Controller);
 		$Controller->beforeFilter();
@@ -391,6 +393,7 @@ function testComponentStartup() {
  */
 	function testMultipleComponentInitialize() {
 		$Controller =& new ComponentTestController();
+		$Controller->uses = false;
 		$Controller->components = array('Orange', 'Banana');
 		$Controller->constructClasses();
 		$Controller->Component->initialize($Controller);
@@ -411,7 +414,7 @@ function testComponentsWithParams() {
 
 		$Controller =& new ComponentTestController();
 		$Controller->components = array('ParamTest' => array('test' => 'value', 'flag'), 'Apple');
-
+		$Controller->uses = false;
 		$Controller->constructClasses();
 		$Controller->Component->initialize($Controller);
 
@@ -443,8 +446,12 @@ function testComponentsWithParams() {
  * @return void
  **/
 	function testComponentParamsNoDuplication() {
+		if ($this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController')) {
+			return;
+		}
 		$Controller =& new ComponentTestController();
 		$Controller->components = array('Orange' => array('setting' => array('itemx')));
+		$Controller->uses = false;
 
 		$Controller->constructClasses();
 		$Controller->Component->initialize($Controller);
@@ -459,6 +466,7 @@ function testComponentParamsNoDuplication() {
 	function testMutuallyReferencingComponents() {
 		$Controller =& new ComponentTestController();
 		$Controller->components = array('MutuallyReferencingOne');
+		$Controller->uses = false;
 		$Controller->constructClasses();
 		$Controller->Component->initialize($Controller);
 
@@ -483,6 +491,7 @@ function testMutuallyReferencingComponents() {
 	function testSomethingReferencingEmailComponent() {
 		$Controller =& new ComponentTestController();
 		$Controller->components = array('SomethingWithEmail');
+		$Controller->uses = false;
 		$Controller->constructClasses();
 		$Controller->Component->initialize($Controller);
 		$Controller->beforeFilter();
@@ -508,14 +517,17 @@ function testSomethingReferencingEmailComponent() {
  * @access public
  */
 	function testDoubleLoadingOfSessionComponent() {
-		$this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController');
+		if ($this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController')) {
+			return;
+		}
 
 		$Controller =& new ComponentTestController();
-		$Controller->uses = array();
+		$Controller->uses = false;
 		$Controller->components = array('Session');
 		$Controller->constructClasses();
 
 		$this->assertEqual($Controller->components, array('Session' => '', 'Orange' => array('colour' => 'blood orange')));
 	}
+
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/groups/controller.group.php b/cake/tests/groups/controller.group.php
index a76073c2a..2a4dcbe80 100644
--- a/cake/tests/groups/controller.group.php
+++ b/cake/tests/groups/controller.group.php
@@ -37,7 +37,7 @@ class ControllerGroupTest extends GroupTest {
  * @var string 'All cake/libs/controller/* (Not yet implemented)'
  * @access public
  */
-	var $label = 'All Controllers and Components';
+	var $label = 'Component, Controllers, Scaffold test cases.';
 /**
  * LibControllerGroupTest method
  *
@@ -45,7 +45,10 @@ class ControllerGroupTest extends GroupTest {
  * @return void
  */
 	function ControllerGroupTest() {
-		TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'controller');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'scaffold');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'pages_controller');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'component');
 	}
 }
 ?>

From 0637272bd2532f7b37c62764562be871df94d3c0 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 31 Oct 2009 14:25:33 -0400
Subject: [PATCH 072/244] Updating doc block on Controller to include more
 information about $uses.

---
 cake/libs/controller/controller.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 6a582bfce..b1d3c4d72 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -73,6 +73,9 @@ class Controller extends Object {
  *
  * Example: var $uses = array('Product', 'Post', 'Comment');
  *
+ * Can be set to array() to use no models.  Can be set to false to 
+ * use no models and prevent the merging of $uses with AppController
+ *
  * @var mixed A single name as a string or a list of names as an array.
  * @access protected
  * @link http://book.cakephp.org/view/53/components-helpers-and-uses

From 24a75a27bf2eee0a6a50e2024452e89533c37b65 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 31 Oct 2009 14:25:52 -0400
Subject: [PATCH 073/244] Updating Javacsript helper to use a real skipIf

---
 cake/tests/cases/libs/view/helpers/javascript.test.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cake/tests/cases/libs/view/helpers/javascript.test.php b/cake/tests/cases/libs/view/helpers/javascript.test.php
index fceb01343..e44a0271a 100644
--- a/cake/tests/cases/libs/view/helpers/javascript.test.php
+++ b/cake/tests/cases/libs/view/helpers/javascript.test.php
@@ -218,8 +218,7 @@ function testLink() {
  * @return void
  */
 	function testFilteringAndTimestamping() {
-		if (!is_writable(JS)) {
-			echo "<br />JavaScript directory not writable, skipping JS asset timestamp tests<br />";
+		if ($this->skipIf(!is_writable(JS), 'JavaScript directory not writable, skipping JS asset timestamp tests. %s')) {
 			return;
 		}
 

From 76019513e1d7723116741ee9b2d10412490cc4b1 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 31 Oct 2009 14:33:53 -0400
Subject: [PATCH 074/244] Updating lib group to run non-mvc libs. Removing
 no_database group.  It was redundant.

---
 cake/tests/groups/lib.group.php         | 12 ++++-
 cake/tests/groups/no_database.group.php | 59 -------------------------
 2 files changed, 10 insertions(+), 61 deletions(-)
 delete mode 100644 cake/tests/groups/no_database.group.php

diff --git a/cake/tests/groups/lib.group.php b/cake/tests/groups/lib.group.php
index 07e6ab41b..999ba7da2 100644
--- a/cake/tests/groups/lib.group.php
+++ b/cake/tests/groups/lib.group.php
@@ -39,7 +39,7 @@ class LibGroupTest extends GroupTest {
  * @var string 'All cake/libs/* (Not yet implemented)'
  * @access public
  */
-	var $label = 'All Libs';
+	var $label = 'All core, non MVC element libs';
 /**
  * LibGroupTest method
  *
@@ -47,7 +47,15 @@ class LibGroupTest extends GroupTest {
  * @return void
  */
 	function LibGroupTest() {
-		TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cake_log');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'class_registry');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'inflector');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'overloadable');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'sanitize');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'security');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'set');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'string');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'validation');
 	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/groups/no_database.group.php b/cake/tests/groups/no_database.group.php
deleted file mode 100644
index f23f6be7f..000000000
--- a/cake/tests/groups/no_database.group.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/* SVN FILE: $Id$ */
-/**
- * NoDatabaseGroupTest file
- *
- * Long description for file
- *
- * PHP versions 4 and 5
- *
- * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- *
- *  Licensed under The Open Group Test Suite License
- *  Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.groups
- * @since         CakePHP(tm) v 1.2.0.4206
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
- */
-/**
- * NoDatabaseGroupTest class
- *
- * This test group will run all test in the cases/libs directory.
- *
- * @package       cake
- * @subpackage    cake.tests.groups
- */
-class NoDatabaseGroupTest extends GroupTest {
-/**
- * label property
- *
- * @var string 'All tests without a database connection'
- * @access public
- */
-	var $label = 'All Libs not requiring a database connection';
-/**
- * NoDatabaseGroupTest method
- *
- * @access public
- * @return void
- */
-	function NoDatabaseGroupTest() {
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'dispatcher');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'router');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'inflector');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'validation');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'session');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'socket');
-		TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'view');
-	}
-}
-?>
\ No newline at end of file

From 6b616b7171cce0eba4fbff88d9934378fe33e543 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 31 Oct 2009 14:48:37 -0400
Subject: [PATCH 075/244] Adding skip for validation test, for DNS servers that
 reply for non-existant domains.

---
 cake/tests/cases/libs/validation.test.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php
index 98c3e6866..4c7721cbc 100644
--- a/cake/tests/cases/libs/validation.test.php
+++ b/cake/tests/cases/libs/validation.test.php
@@ -1584,6 +1584,10 @@ function testEmail() {
  * @return void
  */
 	function testEmailDeep() {
+		$found = gethostbynamel('example.abcd');
+		if ($this->skipIf($found, 'Your DNS service responds for non-existant domains, skipping deep email checks. %s'))  {
+			return;
+		}
 		$this->assertTrue(Validation::email('abc.efg@cakephp.org', true));
 		$this->assertFalse(Validation::email('abc.efg@caphpkeinvalid.com', true));
 		$this->assertFalse(Validation::email('abc@example.abcd', true));

From 51244907d1e9e754528e3e66a88ac7366024890b Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 31 Oct 2009 14:55:04 -0400
Subject: [PATCH 076/244] Updating merge vars test to skip itself if run in a
 group context. Updating controller group.

---
 .../cases/libs/controller/controller_merge_vars.test.php | 9 ++++++++-
 cake/tests/groups/controller.group.php                   | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
index b405d3eca..4ca4db328 100644
--- a/cake/tests/cases/libs/controller/controller_merge_vars.test.php
+++ b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
@@ -124,7 +124,14 @@ class MergePostsController extends MergeVarPluginAppController {
  * @package cake.tests.cases.libs.controller
  **/
 class ControllerMergeVarsTestCase extends CakeTestCase {
-
+/**
+ * Skips the case if APP_CONTROLLER_EXISTS is defined
+ *
+ * @return void
+ **/
+	function skip() {
+		$this->skipIf(defined('APP_CONTROLLER_EXISTS'), 'APP_CONTROLLER_EXISTS cannot run. %s');
+	}
 /**
  * end test
  *
diff --git a/cake/tests/groups/controller.group.php b/cake/tests/groups/controller.group.php
index 2a4dcbe80..8bbc801ac 100644
--- a/cake/tests/groups/controller.group.php
+++ b/cake/tests/groups/controller.group.php
@@ -49,6 +49,7 @@ function ControllerGroupTest() {
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'scaffold');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'pages_controller');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'component');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'controller_merge_vars');
 	}
 }
 ?>

From a87d31cc7f570a1ac03abc2c04b04f71e4f6c955 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 2 Nov 2009 00:07:02 -0500
Subject: [PATCH 077/244] Fixing $cacheAction requiring the inclusion of the
 controller name for view cache files to be generated.  This behavior makes
 the cache helper behave as documented. Test cases added.  Fixes #232

---
 cake/libs/view/helpers/cache.php              | 16 +++-
 .../cases/libs/view/helpers/cache.test.php    | 90 ++++++++++++++++---
 2 files changed, 92 insertions(+), 14 deletions(-)

diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php
index 8f43ecf9e..34a43ba1d 100644
--- a/cake/libs/view/helpers/cache.php
+++ b/cake/libs/view/helpers/cache.php
@@ -75,24 +75,32 @@ function cache($file, $out, $cache = false) {
 		$useCallbacks = false;
 		if (is_array($this->cacheAction)) {
 			$controller = Inflector::underscore($this->controllerName);
+			$controllerAlternate = Inflector::variable($this->controllerName);
+
 			$check = str_replace('/', '_', $this->here);
-			$replace = str_replace('/', '_', $this->base);
+			$basePath = str_replace('/', '_', $this->base);
+
 			$match = str_replace($this->base, '', $this->here);
 			$match = str_replace('//', '/', $match);
 			$match = str_replace('/' . $controller . '/', '', $match);
+			$match = str_replace('/' . $controllerAlternate . '/', '', $match);
 			$match = str_replace('/' . $this->controllerName . '/', '', $match);
-			$check = str_replace($replace, '', $check);
+
+			$check = str_replace($basePath, '', $check);
 			$check = str_replace('_' . $controller . '_', '', $check);
 			$check = str_replace('_' . $this->controllerName . '_', '', $check);
+			$check = str_replace('_' . $controllerAlternate . '_', '', $match);
+
 			$check = Inflector::slug($check);
-			$check = preg_replace('/^_+/', '', $check);
+			$check = trim($check, '_');
+
 			$keys = str_replace('/', '_', array_keys($this->cacheAction));
 			$found = array_keys($this->cacheAction);
 			$index = null;
 			$count = 0;
 
 			foreach ($keys as $key => $value) {
-				if (strpos($check, $value) === 0) {
+				if (strpos($check, rtrim($value, '_')) === 0) {
 					$index = $found[$count];
 					break;
 				}
diff --git a/cake/tests/cases/libs/view/helpers/cache.test.php b/cake/tests/cases/libs/view/helpers/cache.test.php
index fc450ecc9..66b913642 100644
--- a/cake/tests/cases/libs/view/helpers/cache.test.php
+++ b/cake/tests/cases/libs/view/helpers/cache.test.php
@@ -29,14 +29,7 @@
 }
 App::import('Core', array('Controller', 'Model', 'View'));
 App::import('Helper', 'Cache');
-/**
- * TestCacheHelper class
- *
- * @package       cake
- * @subpackage    cake.tests.cases.libs.view.helpers
- */
-class TestCacheHelper extends CacheHelper {
-}
+
 /**
  * CacheTestController class
  *
@@ -81,7 +74,8 @@ class CacheHelperTest extends CakeTestCase {
  */
 	function setUp() {
 		$this->Controller = new CacheTestController();
-		$this->Cache = new TestCacheHelper();
+		$this->Cache = new CacheHelper();
+		$this->_cacheSettings = Configure::read('Cache');
 		Configure::write('Cache.check', true);
 		Configure::write('Cache.disable', false);
 	}
@@ -112,6 +106,7 @@ function endCase() {
  */
 	function tearDown() {
 		unset($this->Cache);
+		Configure::write('Cache', $this->_cacheSettings);
 	}
 /**
  * test cache parsing with no cake:nocache tags in view file.
@@ -201,7 +196,7 @@ function testMultipleNoCacheTagsInViewfile() {
  */
 	function testComplexNoCache () {
 		$this->Controller->cache_parsing();
-		$this->Controller->cacheAction = array('cacheTest' => 21600);
+		$this->Controller->cacheAction = array('cache_complex' => 21600);
 		$this->Controller->here = '/cacheTest/cache_complex';
 		$this->Controller->action = 'cache_complex';
 		$this->Controller->layout = 'multi_cache';
@@ -247,6 +242,81 @@ function testComplexNoCache () {
 		//$this->assertPattern('/6\. in element with no cache tags/', $contents);
 		$this->assertPattern('/7\. layout after content and after element with no cache tags/', $contents);
 	}
+/**
+ * test cacheAction set to a boolean
+ *
+ * @return void
+ **/
+	function testCacheActionArray() {
+		$this->Controller->cache_parsing();
+		$this->Controller->cacheAction = array(
+			'cache_parsing' => 21600
+		);
+		$this->Controller->here = '/cache_test/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cache_test_cache_parsing.php';
+		$this->assertTrue(file_exists($filename));
+		@unlink($filename);
+
+
+		$this->Controller->cache_parsing();
+		$this->Controller->cacheAction = array(
+			'cache_parsing/' => 21600
+		);
+		$this->Controller->here = '/cacheTest/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_parsing.php';
+		$this->assertTrue(file_exists($filename));
+		@unlink($filename);
+
+
+		$this->Controller->cache_parsing();
+		$this->Controller->cacheAction = array(
+			'cache_parsing/33' => 21600
+		);
+		$this->Controller->here = '/cacheTest/cache_parsing/33';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_parsing_33.php';
+		$this->assertTrue(file_exists($filename));
+		@unlink($filename);
+		
+		$this->Controller->cache_parsing();
+		$this->Controller->cacheAction = array(
+			'cache_parsing/33' => 21600
+		);
+		$this->Controller->here = '/cacheTest/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_parsing.php';
+		$this->assertFalse(file_exists($filename));
+	}
 /**
  * testCacheEmptySections method
  *

From 9d2628f699dbae93c90b47579b78d8c7aba64dd8 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 2 Nov 2009 00:07:16 -0500
Subject: [PATCH 078/244] Removing tab

---
 cake/libs/view/view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 1ed8c01cb..199359f9f 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -686,7 +686,7 @@ function _render($___viewFn, $___dataForView, $loadHelpers = true, $cached = fal
 				$cache->helpers = $this->helpers;
 				$cache->action = $this->action;
 				$cache->controllerName = $this->name;
-				$cache->layout	= $this->layout;
+				$cache->layout = $this->layout;
 				$cache->cacheAction = $this->cacheAction;
 				$cache->cache($___viewFn, $out, $cached);
 			}

From 6b043c6c57da5d2d3f0538170e8aa964b2789039 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 2 Nov 2009 21:37:20 -0500
Subject: [PATCH 079/244] Updating doc blocks for paginator helper.

---
 cake/libs/view/helpers/paginator.php | 146 +++++++++++++++++++--------
 1 file changed, 103 insertions(+), 43 deletions(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 0e8505ecf..8362337ac 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -48,20 +48,20 @@ class PaginatorHelper extends AppHelper {
  *
  * The values that may be specified are:
  *
- *  - <i>$options['format']</i> Format of the counter. Supported formats are 'range' and 'pages'
- *   and custom (default). In the default mode the supplied string is parsed and constants are replaced
- *   by their actual values.
- *   Constants: %page%, %pages%, %current%, %count%, %start%, %end% .
- *  - <i>$options['separator']</i> The separator of the actual page and number of pages (default: ' of ').
- *  - <i>$options['url']</i> Url of the action. See Router::url()
- *  - <i>$options['url']['sort']</i>  the key that the recordset is sorted.
- *  - <i>$options['url']['direction']</i> Direction of the sorting (default: 'asc').
- *  - <i>$options['url']['page']</i> Page # to display.
- *  - <i>$options['model']</i> The name of the model.
- *  - <i>$options['escape']</i> Defines if the title field for the link should be escaped (default: true).
- *  - <i>$options['update']</i> DOM id of the element updated with the results of the AJAX call.
- *                             If this key isn't specified Paginator will use plain HTML links.
- *  - <i>$options['indicator']</i> DOM id of the element that will be shown when doing AJAX requests.
+ *  - `$options['format']` Format of the counter. Supported formats are 'range' and 'pages'
+ *    and custom (default). In the default mode the supplied string is parsed and constants are replaced
+ *    by their actual values.
+ *    Constants: %page%, %pages%, %current%, %count%, %start%, %end% .
+ *  - `$options['separator']` The separator of the actual page and number of pages (default: ' of ').
+ *  - `$options['url']` Url of the action. See Router::url()
+ *  - `$options['url']['sort']`  the key that the recordset is sorted.
+ *  - `$options['url']['direction']` Direction of the sorting (default: 'asc').
+ *  - `$options['url']['page']` Page # to display.
+ *  - `$options['model']` The name of the model.
+ *  - `$options['escape']` Defines if the title field for the link should be escaped (default: true).
+ *  - `$options['update']` DOM id of the element updated with the results of the AJAX call.
+ *     If this key isn't specified Paginator will use plain HTML links.
+ *  - `$options['indicator']` DOM id of the element that will be shown when doing AJAX requests.
  *
  * @var array
  */
@@ -69,7 +69,7 @@ class PaginatorHelper extends AppHelper {
 /**
  * Gets the current paging parameters from the resultset for the given model
  *
- * @param  string $model Optional model name.  Uses the default if none is specified.
+ * @param string $model Optional model name.  Uses the default if none is specified.
  * @return array The array of paging parameters for the paginated resultset.
  */
 	function params($model = null) {
@@ -84,7 +84,7 @@ function params($model = null) {
 /**
  * Sets default options for all pagination links
  *
- * @param  mixed $options Default options for pagination links. If a string is supplied - it
+ * @param mixed $options Default options for pagination links. If a string is supplied - it
  * is used as the DOM id element to update. See #options for list of keys.
  */
 	function options($options = array()) {
@@ -113,7 +113,7 @@ function options($options = array()) {
 /**
  * Gets the current page of the recordset for the given model
  *
- * @param  string $model Optional model name.  Uses the default if none is specified.
+ * @param string $model Optional model name.  Uses the default if none is specified.
  * @return string The current page number of the recordset.
  */
 	function current($model = null) {
@@ -127,8 +127,8 @@ function current($model = null) {
 /**
  * Gets the current key by which the recordset is sorted
  *
- * @param  string $model Optional model name.  Uses the default if none is specified.
- * @param  mixed $options Options for pagination links. See #options for list of keys.
+ * @param string $model Optional model name.  Uses the default if none is specified.
+ * @param mixed $options Options for pagination links. See #options for list of keys.
  * @return string The name of the key by which the recordset is being sorted, or
  *  null if the results are not currently sorted.
  */
@@ -158,8 +158,8 @@ function sortKey($model = null, $options = array()) {
 /**
  * Gets the current direction the recordset is sorted
  *
- * @param  string $model Optional model name.  Uses the default if none is specified.
- * @param  mixed $options Options for pagination links. See #options for list of keys.
+ * @param string $model Optional model name.  Uses the default if none is specified.
+ * @param mixed $options Options for pagination links. See #options for list of keys.
  * @return string The direction by which the recordset is being sorted, or
  *  null if the results are not currently sorted.
  */
@@ -185,6 +185,12 @@ function sortDir($model = null, $options = array()) {
 /**
  * Generates a "previous" link for a set of paged records
  *
+ * Options:
+ *
+ * - `tag` The tag wrapping tag you want to use, defaults to 'span'
+ * - `escape` Whether you want the contents html entity encoded, defaults to true
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel()
+ *
  * @param  string $title Title for the link. Defaults to '<< Previous'.
  * @param  mixed $options Options for pagination link. See #options for list of keys.
  * @param  string $disabledTitle Title when the link is disabled.
@@ -197,10 +203,16 @@ function prev($title = '<< Previous', $options = array(), $disabledTitle = null,
 /**
  * Generates a "next" link for a set of paged records
  *
- * @param  string $title Title for the link. Defaults to 'Next >>'.
- * @param  mixed $options Options for pagination link. See #options for list of keys.
- * @param  string $disabledTitle Title when the link is disabled.
- * @param  mixed $disabledOptions Options for the disabled pagination link. See #options for list of keys.
+ * Options:
+ *
+ * - `tag` The tag wrapping tag you want to use, defaults to 'span'
+ * - `escape` Whether you want the contents html entity encoded, defaults to true
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel()
+ *
+ * @param string $title Title for the link. Defaults to 'Next >>'.
+ * @param mixed $options Options for pagination link. See above for list of keys.
+ * @param string $disabledTitle Title when the link is disabled.
+ * @param mixed $disabledOptions Options for the disabled pagination link. See above for list of keys.
  * @return string A "next" link or or $disabledTitle text if the link is disabled.
  */
 	function next($title = 'Next >>', $options = array(), $disabledTitle = null, $disabledOptions = array()) {
@@ -210,10 +222,15 @@ function next($title = 'Next >>', $options = array(), $disabledTitle = null, $di
  * Generates a sorting link. Sets named parameters for the sort and direction.  Handles
  * direction switching automatically.
  *
+ * Options:
+ *
+ * - `escape` Whether you want the contents html entity encoded, defaults to true
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel()
+ *
  * @param string $title Title for the link.
  * @param string $key The name of the key that the recordset should be sorted.  If $key is null
  *   $title will be used for the key, and a title will be generated by inflection.
- * @param array $options Options for sorting link. See #options for list of keys.
+ * @param array $options Options for sorting link. See above for list of keys.
  * @return string A link sorting default by 'asc'. If the resultset is sorted 'asc' by the specified
  *  key the returned link will sort by 'desc'.
  */
@@ -244,9 +261,16 @@ function sort($title, $key = null, $options = array()) {
 /**
  * Generates a plain or Ajax link with pagination parameters
  *
- * @param  string $title Title for the link.
- * @param  mixed $url Url for the action. See Router::url()
- * @param  array $options Options for the link. See #options for list of keys.
+ * Options
+ *
+ * - `update` The Id of the DOM element you wish to update.  Creates Ajax enabled links
+ *    with the AjaxHelper.
+ * - `escape` Whether you want the contents html entity encoded, defaults to true
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel()
+ *
+ * @param string $title Title for the link.
+ * @param mixed $url Url for the action. See Router::url()
+ * @param array $options Options for the link. See #options for list of keys.
  * @return string A link with pagination parameters.
  */
 	function link($title, $url = array(), $options = array()) {
@@ -271,9 +295,9 @@ function link($title, $url = array(), $options = array()) {
 /**
  * Merges passed URL options with current pagination state to generate a pagination URL.
  *
- * @param  array $options Pagination/URL options array
- * @param  boolean $asArray
- * @param  string $model Which model to paginate on
+ * @param array $options Pagination/URL options array
+ * @param boolean $asArray Return the url as an array, or a URI string 
+ * @param string $model Which model to paginate on
  * @return mixed By default, returns a full pagination URL string for use in non-standard contexts (i.e. JavaScript)
  */
 	function url($options = array(), $asArray = false, $model = null) {
@@ -328,7 +352,7 @@ function __pagingLink($which, $title = null, $options = array(), $disabledTitle
 /**
  * Returns true if the given result set is not at the first page
  *
- * @param string $model Optional model name.  Uses the default if none is specified.
+ * @param string $model Optional model name. Uses the default if none is specified.
  * @return boolean True if the result set is not at the first page.
  */
 	function hasPrev($model = null) {
@@ -346,8 +370,8 @@ function hasNext($model = null) {
 /**
  * Returns true if the given result set has the page number given by $page
  *
- * @param  string $model Optional model name.  Uses the default if none is specified.
- * @param  int $page The page number - if not set defaults to 1.
+ * @param string $model Optional model name.  Uses the default if none is specified.
+ * @param int $page The page number - if not set defaults to 1.
  * @return boolean True if the given result set has the specified page number.
  */
 	function hasPage($model = null, $page = 1) {
@@ -389,7 +413,16 @@ function defaultModel() {
 /**
  * Returns a counter string for the paged result set
  *
- * @param  mixed $options Options for the counter string. See #options for list of keys.
+ * Options
+ *
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel();
+ * - `format` The format string you want to use, defaults to 'pages' Which generates output like '1 of 5'
+ *    set to 'range' to generate output like '1 - 3 of 13'.  Can also be set to a custom string, containing 
+ *    the following placeholders `%page%`, `%pages%`, `%current%`, `%count%`, `%start%`, `%end%` and any
+ *    custom content you would like.
+ * - `separator` The separator string to use, default to ' of '
+ *
+ * @param mixed $options Options for the counter string. See #options for list of keys.
  * @return string Counter string.
  */
 	function counter($options = array()) {
@@ -400,8 +433,8 @@ function counter($options = array()) {
 		$options = array_merge(
 			array(
 				'model' => $this->defaultModel(),
-				'format' => 'pages',
-				'separator' => ' of '
+				'format' => 'pages'
+				'separator' => __(' of ', true)
 			),
 		$options);
 
@@ -446,7 +479,20 @@ function counter($options = array()) {
  * Returns a set of numbers for the paged result set
  * uses a modulus to decide how many numbers to show on each side of the current page (default: 8)
  *
- * @param  mixed $options Options for the numbers, (before, after, model, modulus, separator)
+ * Options
+ *
+ * - `before` Content to be inserted before the numbers
+ * - `after` Content to be inserted after the numbers
+ * - `model` Model to create numbers for, defaults to PaginatorHelper::defaultModel()
+ * - `modulus` how many numbers to include on either side of the current page, defaults to 8.
+ * - `separator` Separator content defaults to ' | '
+ * - `tag` The tag to wrap links in, defaults to 'span'
+ * - `first` Whether you want first links generated, set to an integer to define the number of 'first' 
+ *    links to generate
+ * - `last` Whether you want last links generated, set to an integer to define the number of 'last' 
+ *    links to generate
+ *
+ * @param mixed $options Options for the numbers, (before, after, model, modulus, separator)
  * @return string numbers string.
  */
 	function numbers($options = array()) {
@@ -555,8 +601,15 @@ function numbers($options = array()) {
 /**
  * Returns a first or set of numbers for the first pages
  *
- * @param  mixed $first if string use as label for the link, if numeric print page numbers
- * @param  mixed $options
+ * Options:
+ *
+ * - `tag` The tag wrapping tag you want to use, defaults to 'span'
+ * - `before` Content to insert before the link/tag
+ * - `model` The model to use defaults to PaginatorHelper::defaultModel()
+ * - `separator` Content between the generated links, defaults to ' | '
+ *
+ * @param mixed $first if string use as label for the link, if numeric print page numbers
+ * @param mixed $options
  * @return string numbers string.
  */
 	function first($first = '<< first', $options = array()) {
@@ -599,8 +652,15 @@ function first($first = '<< first', $options = array()) {
 /**
  * Returns a last or set of numbers for the last pages
  *
- * @param  mixed $last if string use as label for the link, if numeric print page numbers
- * @param  mixed $options
+ * Options:
+ *
+ * - `tag` The tag wrapping tag you want to use, defaults to 'span'
+ * - `before` Content to insert before the link/tag
+ * - `model` The model to use defaults to PaginatorHelper::defaultModel()
+ * - `separator` Content between the generated links, defaults to ' | '
+ *
+ * @param mixed $last if string use as label for the link, if numeric print page numbers
+ * @param mixed $options Array of options
  * @return string numbers string.
  */
 	function last($last = 'last >>', $options = array()) {

From 133299c653ecd0139b12e898a186f3c15dfdaf8b Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 3 Nov 2009 09:02:17 -0500
Subject: [PATCH 080/244] Removing duplicate constructor from ShellDispatcher.
 Fixes warnings under PHP5.3. Fixes #132

---
 cake/console/cake.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/cake/console/cake.php b/cake/console/cake.php
index 2210beecf..cfd118302 100644
--- a/cake/console/cake.php
+++ b/cake/console/cake.php
@@ -118,14 +118,6 @@ class ShellDispatcher {
  * @param array $args the argv.
  */
 	function ShellDispatcher($args = array()) {
-		$this->__construct($args);
-	}
-/**
- * Constructor
- *
- * @param array $args the argv.
- */
-	function __construct($args = array()) {
 		set_time_limit(0);
 		$this->__initConstants();
 		$this->parseParams($args);

From d63218c0a09c26bebc5c5104e63be2f144ee9101 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 3 Nov 2009 09:52:59 -0500
Subject: [PATCH 081/244] Fixing error in previous commit.

---
 cake/libs/view/helpers/paginator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 8362337ac..9fa185ddc 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -433,7 +433,7 @@ function counter($options = array()) {
 		$options = array_merge(
 			array(
 				'model' => $this->defaultModel(),
-				'format' => 'pages'
+				'format' => 'pages',
 				'separator' => __(' of ', true)
 			),
 		$options);

From 8c46cc49fbc234f1d760b5757aa322201e0a1161 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 3 Nov 2009 13:14:38 -0500
Subject: [PATCH 082/244] Fixing issue in Dispatcher::cached() where plugins
 ending in asset extensions would be incorrectly handled. Test added Fixes
 #237

---
 cake/dispatcher.php                                | 14 +++++++++-----
 cake/tests/cases/dispatcher.test.php               | 11 ++++++++++-
 .../plugins/plugin_js/vendors/js/plugin_js.js      |  1 +
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 cake/tests/test_app/plugins/plugin_js/vendors/js/plugin_js.js

diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index ca147f305..b2b1d81d4 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -598,15 +598,19 @@ function cached($url) {
 				$this->_stop();
 			}
 			$isAsset = false;
-			$assets = array('js' => 'text/javascript', 'css' => 'text/css', 'gif' => 'image/gif', 'jpg' => 'image/jpeg', 'png' => 'image/png');
+			$assets = array(
+				'js' => 'text/javascript', 'css' => 'text/css',
+				'gif' => 'image/gif', 'jpg' => 'image/jpeg', 'png' => 'image/png'
+			);
 			$ext = array_pop(explode('.', $url));
 
 			foreach ($assets as $type => $contentType) {
 				if ($type === $ext) {
-					if ($type === 'css' || $type === 'js') {
-						$pos = strpos($url, $type . '/');
+					$parts = explode('/', $url);
+					if ($parts[0] === 'css' || $parts[0] === 'js' || $parts[0] === 'img') {
+						$pos = 0;
 					} else {
-						$pos = strpos($url, 'img/');
+						$pos = strlen($parts[0]);
 					}
 					$isAsset = true;
 					break;
@@ -624,7 +628,7 @@ function cached($url) {
 				$paths = array();
 
 				if ($pos > 0) {
-					$plugin = substr($url, 0, $pos - 1);
+					$plugin = substr($url, 0, $pos);
 					$url = preg_replace('/^' . preg_quote($plugin, '/') . '\//i', '', $url);
 					$pluginPaths = Configure::read('pluginPaths');
 					$count = count($pluginPaths);
diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php
index 613c8949a..4ea07969b 100644
--- a/cake/tests/cases/dispatcher.test.php
+++ b/cake/tests/cases/dispatcher.test.php
@@ -1711,7 +1711,7 @@ function testStaticAssets() {
 
 		Configure::write('debug', 0);
 		ob_start();
-		$Dispatcher->dispatch('/img/test.jpg');
+		$Dispatcher->dispatch('img/test.jpg');
 		$result = ob_get_clean();
 		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors' . DS . 'img' . DS . 'test.jpg');
 		$this->assertEqual($file, $result);
@@ -1756,6 +1756,15 @@ function testStaticAssets() {
 		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' .DS . 'vendors' . DS . 'img' . DS . 'cake.icon.gif');
 		$this->assertEqual($file, $result);
 
+
+		Configure::write('debug', 2);
+		$Dispatcher->params = $Dispatcher->parseParams('plugin_js/js/plugin_js.js');
+		ob_start();
+		$Dispatcher->cached('plugin_js/js/plugin_js.js');
+		$result = ob_get_clean();
+		$expected = "alert('win sauce');";
+		$this->assertEqual($result, $expected);
+
 		header('Content-type: text/html');//reset the header content-type without page can render as plain text.
 	}
 /**
diff --git a/cake/tests/test_app/plugins/plugin_js/vendors/js/plugin_js.js b/cake/tests/test_app/plugins/plugin_js/vendors/js/plugin_js.js
new file mode 100644
index 000000000..ac52468f6
--- /dev/null
+++ b/cake/tests/test_app/plugins/plugin_js/vendors/js/plugin_js.js
@@ -0,0 +1 @@
+alert('win sauce');
\ No newline at end of file

From e609875754103913927f4bab7f67323aa6529165 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 4 Nov 2009 12:36:17 -0500
Subject: [PATCH 083/244] Updating Model::invalidFields, so returning false
 from beforeValidate() will abort both the validation and saving() of the
 record. Tests added to check beforeSave, beforeValidate, and beforeDelete
 return values. Fixes #257

---
 cake/libs/model/model.php                     |  4 +-
 .../cases/libs/model/model_delete.test.php    | 15 ++++++
 .../cases/libs/model/model_write.test.php     | 34 ++++++++++++
 cake/tests/cases/libs/model/models.php        | 53 ++++++++++++++++++-
 4 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index abf93d39c..84b096fbe 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -2359,7 +2359,7 @@ function invalidFields($options = array()) {
 			) ||
 			$this->beforeValidate($options) === false
 		) {
-			return $this->validationErrors;
+			return false;
 		}
 
 		if (!isset($this->validate) || empty($this->validate)) {
@@ -2793,7 +2793,7 @@ function beforeDelete($cascade = true) {
 	function afterDelete() {
 	}
 /**
- * Called during save operations, before validation. Please note that custom
+ * Called during validation operations, before validation. Please note that custom
  * validation rules can be defined in $validate.
  *
  * @return boolean True if validate operation should continue, false to abort
diff --git a/cake/tests/cases/libs/model/model_delete.test.php b/cake/tests/cases/libs/model/model_delete.test.php
index 6d30d2bdf..2be205e92 100644
--- a/cake/tests/cases/libs/model/model_delete.test.php
+++ b/cake/tests/cases/libs/model/model_delete.test.php
@@ -565,7 +565,22 @@ function testHabtmDeleteLinksWhenNoPrimaryKeyInJoinTable() {
 		));
 		$this->assertEqual($result['Monkey'], $expected);
 	}
+/**
+ * test that beforeDelete returning false can abort deletion.
+ *
+ * @return void
+ **/
+	function testBeforeDeleteDeleteAbortion() {
+		$this->loadFixtures('Post');
+		$Model =& new CallbackPostTestModel();
+		$Model->beforeDeleteReturn = false;
 
+		$result = $Model->delete(1);
+		$this->assertFalse($result);
+
+		$exists = $Model->findById(1);
+		$this->assertTrue(is_array($exists));
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
index 3d023ce11..4d969cca9 100644
--- a/cake/tests/cases/libs/model/model_write.test.php
+++ b/cake/tests/cases/libs/model/model_write.test.php
@@ -601,6 +601,40 @@ function testValidatesBackwards() {
 		$result = $TestModel->validates();
 		$this->assertTrue($result);
 	}
+/**
+ * test that beforeValidate returning false can abort saves.
+ *
+ * @return void
+ **/
+	function testBeforeValidateSaveAbortion() {
+		$Model =& new CallbackPostTestModel();
+		$Model->beforeValidateReturn = false;
+		
+		$data = array(
+			'title' => 'new article',
+			'body' => 'this is some text.'
+		);
+		$Model->create();
+		$result = $Model->save($data);
+		$this->assertFalse($result);
+	}
+/**
+ * test that beforeSave returning false can abort saves.
+ *
+ * @return void
+ **/
+	function testBeforeSaveSaveAbortion() {
+		$Model =& new CallbackPostTestModel();
+		$Model->beforeSaveReturn = false;
+
+		$data = array(
+			'title' => 'new article',
+			'body' => 'this is some text.'
+		);
+		$Model->create();
+		$result = $Model->save($data);
+		$this->assertFalse($result);
+	}
 /**
  * testValidates method
  *
diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index 64541c4fd..f601b82aa 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -1749,7 +1749,58 @@ class AssociationTest2 extends CakeTestModel {
  * @subpackage    cake.tests.cases.libs.model
  */
 class Callback extends CakeTestModel {
-	//
+	
+}
+/**
+ * CallbackPostTestModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class CallbackPostTestModel extends CakeTestModel {
+	var $useTable = 'posts';
+/**
+ * variable to control return of beforeValidate
+ *
+ * @var string
+ */
+	var $beforeValidateReturn = true;
+/**
+ * variable to control return of beforeSave
+ *
+ * @var string
+ */
+	var $beforeSaveReturn = true;
+/**
+ * variable to control return of beforeDelete
+ *
+ * @var string
+ */
+	var $beforeDeleteReturn = true;
+/**
+ * beforeSave callback
+ *
+ * @return void
+ **/
+	function beforeSave($options) {
+		return $this->beforeSaveReturn;
+	}
+/**
+ * beforeValidate callback
+ *
+ * @return void
+ **/
+	function beforeValidate($options) {
+		return $this->beforeValidateReturn;
+	}
+/**
+ * beforeDelete callback
+ *
+ * @return void
+ **/
+	function beforeDelete($cascade = true) {
+		return $this->beforeDeleteReturn;
+	}
 }
 /**
  * Uuid class

From b4f6dd9c6e304164c8b0fc64d29d7de82617c23e Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 4 Nov 2009 22:57:43 -0500
Subject: [PATCH 084/244] Adding tests and support for binary columns in model
 task. Fixes #241

---
 cake/console/libs/tasks/model.php                  | 1 +
 cake/tests/cases/console/libs/tasks/model.test.php | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index 2d75be9ba..b962a13df 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -870,6 +870,7 @@ function fixture($model, $useTable = null) {
 								case 'integer':
 									$insert = 1;
 								break;
+								case 'binary':
 								case 'string';
 									$insert = "Lorem ipsum dolor sit amet";
 									if (!empty($value['length'])) {
diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php
index b273b69cc..a2e7f5c54 100644
--- a/cake/tests/cases/console/libs/tasks/model.test.php
+++ b/cake/tests/cases/console/libs/tasks/model.test.php
@@ -53,7 +53,7 @@
  * @subpackage    cake.tests.cases.console.libs.tasks
  */
 class ModelTaskTest extends CakeTestCase {
-	var $fixtures = array('core.datatype');
+	var $fixtures = array('core.datatype', 'core.binary_test');
 /**
  * setUp method
  *
@@ -84,7 +84,9 @@ function testFixtureGeneration() {
 		$this->Task->setReturnValue('createFile', true);
 		$result = $this->Task->fixture('Datatype');
 		$this->assertPattern('/float_field\' => 1/', $result);
-		
+
+		$result = $this->Task->fixture('BinaryTest');
+		$this->assertPattern("/'data' => 'Lorem ipsum dolor sit amet'/", $result);
 	}
 }
 ?>
\ No newline at end of file

From 0327f15395f561df4fd2c05af81094bb6d8cfa5a Mon Sep 17 00:00:00 2001
From: Ernst Mayerhofer <e.mayerhofer@bluemonkeys.at>
Date: Thu, 5 Nov 2009 19:21:53 +0100
Subject: [PATCH 085/244] paginator works with limit 0 now too

---
 cake/tests/cases/libs/controller/controller.test.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index 8c7b3204c..555296d1f 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -511,6 +511,13 @@ function testPaginate() {
 		$Controller->paginate('ControllerPost');
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1, 'XSS exploit opened %s');
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['options']['page'], 1, 'XSS exploit opened %s');
+		
+		$Controller->paginate = array('limit' => 0);
+		$Controller->paginate('ControllerPost');
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['pageCount'], 1);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['prevPage'], false);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['nextPage'], false);
 	}
 /**
  * testPaginateExtraParams method

From 4bbfcbff7e90fab42bef39e01003113dc715a3b0 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 6 Nov 2009 00:44:21 -0500
Subject: [PATCH 086/244] Fixing limit:0 and controller::paginate.  Removes
 possibilty to generate sql errors by inputting invalid limit options. Tests
 updated.  Refs #264

---
 cake/libs/controller/controller.php               |  5 +++--
 .../cases/libs/controller/controller.test.php     | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index b1d3c4d72..273d51e23 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -1044,8 +1044,9 @@ function paginate($object = null, $scope = array(), $whitelist = array()) {
 			$type = $defaults[0];
 			unset($defaults[0]);
 		}
-
-		extract($options = array_merge(array('page' => 1, 'limit' => 20), $defaults, $options));
+		$options = array_merge(array('page' => 1, 'limit' => 20), $defaults, $options);
+		$options['limit'] = (empty($options['limit']) || !is_numeric($options['limit'])) ? 1 : $options['limit'];
+		extract($options);
 
 		if (is_array($scope) && !empty($scope)) {
 			$conditions = array_merge($conditions, $scope);
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index 555296d1f..4b978a03e 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -511,13 +511,22 @@ function testPaginate() {
 		$Controller->paginate('ControllerPost');
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1, 'XSS exploit opened %s');
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['options']['page'], 1, 'XSS exploit opened %s');
-		
+
+		$Controller->passedArgs = array();
 		$Controller->paginate = array('limit' => 0);
 		$Controller->paginate('ControllerPost');
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1);
-		$this->assertIdentical($Controller->params['paging']['ControllerPost']['pageCount'], 1);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['pageCount'], 3);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['prevPage'], false);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['nextPage'], true);
+		
+		$Controller->passedArgs = array();
+		$Controller->paginate = array('limit' => 'garbage!');
+		$Controller->paginate('ControllerPost');
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['pageCount'], 3);
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['prevPage'], false);
-		$this->assertIdentical($Controller->params['paging']['ControllerPost']['nextPage'], false);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['nextPage'], true);
 	}
 /**
  * testPaginateExtraParams method

From 30dc0cfe569ea3f10d325c4e59d5642143c88424 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 7 Nov 2009 10:40:48 -0500
Subject: [PATCH 087/244] Removing unused $view property from CacheHelper.
 Fixes #272

---
 cake/libs/view/helpers/cache.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php
index 34a43ba1d..f27663b4f 100644
--- a/cake/libs/view/helpers/cache.php
+++ b/cake/libs/view/helpers/cache.php
@@ -48,13 +48,6 @@ class CacheHelper extends AppHelper {
  * @access private
  */
 	var $__match = array();
-/**
- * holds the View object passed in final call to CacheHelper::cache()
- *
- * @var View
- * @access public
- */
-	var $view;
 /**
  * cache action time
  *

From dd0c4a64c5ec65940a6a60fea771d65ea77289e8 Mon Sep 17 00:00:00 2001
From: ceeram <mayl@planet.nl>
Date: Wed, 4 Nov 2009 12:31:39 +0100
Subject: [PATCH 088/244] Test to prove ticket #253

---
 .../cases/libs/model/behaviors/containable.test.php   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index ca16f3188..b1d995ccb 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -3380,6 +3380,17 @@ function testResetDeeperHasOneAssociations() {
 		));
 		$this->assertEqual($expected, $this->Article->User->hasOne);
 
+		$this->Article->User->bindModel($userHasOne, false);
+		$expected = $this->Article->User->hasOne;
+		$this->Article->find('all', array(
+			'contain' => array(
+				'User' => array(
+					'Comment' => array('fields' => array('created'))
+				)
+			)
+		));
+		$this->assertEqual($expected, $this->Article->User->hasOne);
+		
 		$this->Article->User->bindModel($userHasOne, false);
 		$expected = $this->Article->User->hasOne;
 		$this->Article->find('all', array(

From 6db91b0f49b71dcc1200dfb9fb95841bfb1525a1 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 7 Nov 2009 17:43:18 -0500
Subject: [PATCH 089/244] Fixing issues in ContainableBehavior that could leave
 models unbound when 'fields' was used as part of containment conditions. 
 Fixes #253

---
 cake/libs/model/behaviors/containable.php                  | 2 +-
 cake/tests/cases/libs/model/behaviors/containable.test.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php
index ed5dd6d5d..9bec011a2 100644
--- a/cake/libs/model/behaviors/containable.php
+++ b/cake/libs/model/behaviors/containable.php
@@ -155,7 +155,7 @@ function beforeFind(&$Model, $query) {
 							if (!$reset && empty($instance->__backOriginalAssociation)) {
 								$instance->__backOriginalAssociation = $backupBindings;
 							} else if ($reset) {
-								$instance->__backAssociation[$type] = $instance->{$type};
+								$instance->__backAssociation[$type] = $backupBindings[$type];
 							}
 							$instance->{$type}[$assoc] = array_merge($instance->{$type}[$assoc], $model['keep'][$assoc]);
 						}
diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index b1d995ccb..d5ae197c8 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -3390,7 +3390,7 @@ function testResetDeeperHasOneAssociations() {
 			)
 		));
 		$this->assertEqual($expected, $this->Article->User->hasOne);
-		
+
 		$this->Article->User->bindModel($userHasOne, false);
 		$expected = $this->Article->User->hasOne;
 		$this->Article->find('all', array(

From 82a2b1a01957ccbfd3a6abe31133f49b9005bced Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 7 Nov 2009 17:53:14 -0500
Subject: [PATCH 090/244] Changing import of Dispatcher to direct require.
 Modifying order of operations in Configure::__loadBootstrap() moving
 inclusion of app/config/bootstrap.php after the creation of core cache
 configs.  This allows App::import() to be used in the bootstrap file with
 cached paths.

---
 cake/bootstrap.php      | 2 +-
 cake/libs/configure.php | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cake/bootstrap.php b/cake/bootstrap.php
index 0a28e5558..f9aa7b438 100644
--- a/cake/bootstrap.php
+++ b/cake/bootstrap.php
@@ -48,5 +48,5 @@
 
 	$url = null;
 
-	App::import('Core', array('Dispatcher'));
+	require CAKE . 'dispatcher.php';
 ?>
\ No newline at end of file
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 05cb2875e..985890cfe 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -652,10 +652,6 @@ function __loadBootstrap($boot) {
 				trigger_error(sprintf(__("Can't find application core file. Please create %score.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
 			}
 
-			if (!include(CONFIGS . 'bootstrap.php')) {
-				trigger_error(sprintf(__("Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
-			}
-
 			if (Configure::read('Cache.disable') !== true) {
 				$cache = Cache::config('default');
 
@@ -692,6 +688,11 @@ function __loadBootstrap($boot) {
 				}
 				Cache::config('default');
 			}
+
+			if (!include(CONFIGS . 'bootstrap.php')) {
+				trigger_error(sprintf(__("Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
+			}
+
 			Configure::buildPaths(compact(
 				'modelPaths', 'viewPaths', 'controllerPaths', 'helperPaths', 'componentPaths',
 				'behaviorPaths', 'pluginPaths', 'vendorPaths', 'localePaths', 'shellPaths'

From a7a6dc8c43fddb2f78226f136203b851a80f6328 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 8 Nov 2009 14:12:18 -0500
Subject: [PATCH 091/244] Fixing issue where SecurityComponent::_validatePost
 could generate notices if elements were removed from _Token array. Tests
 Added Fixed #228

---
 cake/libs/controller/components/security.php  |  2 +-
 .../controller/components/security.test.php   | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index 96d140256..64e0af936 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -545,7 +545,7 @@ function _validatePost(&$controller) {
 		}
 		$data = $controller->data;
 
-		if (!isset($data['_Token']) || !isset($data['_Token']['fields'])) {
+		if (!isset($data['_Token']) || !isset($data['_Token']['fields']) || !isset($data['_Token']['key'])) {
 			return false;
 		}
 		$token = $data['_Token']['key'];
diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php
index 0aa80c393..d3a3fff5a 100644
--- a/cake/tests/cases/libs/controller/components/security.test.php
+++ b/cake/tests/cases/libs/controller/components/security.test.php
@@ -527,6 +527,31 @@ function testValidatePost() {
 		);
 		$this->assertTrue($this->Controller->Security->validatePost($this->Controller));
 	}
+/**
+ * test that validatePost fails if any of its required fields are missing.
+ *
+ * @return void
+ **/
+	function testValidatePostFormHacking() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = 'a5475372b40f6e3ccbf9f8af191f20e1642fd877%3An%3A1%3A%7Bv%3A0%3B';
+		$fields .= 'f%3A11%3A%22Zbqry.inyvq%22%3B%7D';
+
+		$this->Controller->data = array(
+			'Model' => array('username' => 'nate', 'password' => 'foo', 'valid' => '0'),
+			'_Token' => compact('key')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertFalse($result, 'validatePost passed when fields were missing. %s');
+
+		$this->Controller->data = array(
+			'Model' => array('username' => 'nate', 'password' => 'foo', 'valid' => '0'),
+			'_Token' => compact('fields')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertFalse($result, 'validatePost passed when key was missing. %s');
+	}
 /**
  * Tests validation of checkbox arrays
  *

From 38f578199de3ff6b6debbe8c17d73762354fd6d0 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 12 Nov 2009 09:32:45 -0500
Subject: [PATCH 092/244] Changing new Model() for ClassRegistry::init(). Fixes
 issues when baking admin and non-admin methods for a controller that uses
 bound translations + TranslateBehavior.  Fixes #245

---
 cake/console/libs/tasks/controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index efc363106..c49735ed8 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -252,7 +252,7 @@ function bakeActions($controllerName, $admin = null, $wannaUseSession = true) {
 			exit;
 		}
 		$actions = null;
-		$modelObj =& new $currentModelName();
+		$modelObj =& ClassRegistry::init($currentModelName);
 		$controllerPath = $this->_controllerPath($controllerName);
 		$pluralName = $this->_pluralName($currentModelName);
 		$singularName = Inflector::variable($currentModelName);

From 1c8a2f232bbe66cce3d0915b7f91d5b1ad16b100 Mon Sep 17 00:00:00 2001
From: nate <nate@cakephp.org>
Date: Thu, 10 Sep 2009 09:28:55 -0400
Subject: [PATCH 093/244] Changes Model::find() to allow modification of
 DataSource connection during callbacks.

---
 cake/libs/model/model.php                       |  4 +++-
 cake/tests/cases/libs/model/model_read.test.php | 17 +++++++++++++++++
 cake/tests/cases/libs/model/models.php          | 12 ++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 84b096fbe..4f1934def 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1948,7 +1948,6 @@ function find($conditions = null, $fields = array(), $order = null, $recursive =
 			list($type, $query) = array($conditions, $fields);
 		}
 
-		$db =& ConnectionManager::getDataSource($this->useDbConfig);
 		$this->findQueryType = $type;
 		$this->id = $this->getID();
 
@@ -1995,6 +1994,9 @@ function find($conditions = null, $fields = array(), $order = null, $recursive =
 			}
 		}
 
+		if (!$db =& ConnectionManager::getDataSource($this->useDbConfig)) {
+			return false;
+		}
 		$results = $db->read($this, $query);
 		$this->resetAssociations();
 		$this->findQueryType = null;
diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php
index eec0cfe70..74def2ae4 100644
--- a/cake/tests/cases/libs/model/model_read.test.php
+++ b/cake/tests/cases/libs/model/model_read.test.php
@@ -4899,6 +4899,23 @@ function testCallbackDisabling() {
 		$expected = array('mariano', 'nate', 'larry', 'garrett');
 		$this->assertEqual($result, $expected);
 	}
+
+	/**
+	 * Tests that the database configuration assigned to the model can be changed using
+	 * (before|after)Find callbacks
+	 *
+	 * @return void
+	 */
+	function testCallbackSourceChange() {
+		$this->loadFixtures('Post');
+		$TestModel = new Post();
+		$this->assertEqual(3, count($TestModel->find('all')));
+
+		$this->expectError(new PatternExpectation('/Non-existent data source foo/i'));
+		$this->expectError(new PatternExpectation('/Only variable references/i'));
+		$this->assertFalse($TestModel->find('all', array('connection' => 'foo')));
+	}
+
 /**
  * testMultipleBelongsToWithSameClass method
  *
diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index f601b82aa..086eda794 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -763,6 +763,18 @@ class Post extends CakeTestModel {
  * @access public
  */
 	var $belongsTo = array('Author');
+
+	function beforeFind($queryData) {
+		if (isset($queryData['connection'])) {
+			$this->useDbConfig = $queryData['connection'];
+		}
+		return true;
+	}
+
+	function afterFind($results) {
+		$this->useDbConfig = 'test_suite';
+		return $results;
+	}
 }
 /**
  * Author class

From ea482442ffa046117b9e6d49cad2c99ce7d643b6 Mon Sep 17 00:00:00 2001
From: ceeram <mayl@planet.nl>
Date: Fri, 13 Nov 2009 14:23:33 +0100
Subject: [PATCH 094/244] test to prove ticket #291

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/tests/cases/libs/inflector.test.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php
index 2c293bb53..3823dbc72 100644
--- a/cake/tests/cases/libs/inflector.test.php
+++ b/cake/tests/cases/libs/inflector.test.php
@@ -109,6 +109,7 @@ function testInflectingSingulars() {
 		$this->assertEqual(Inflector::singularize('faxes'), 'fax');
 		$this->assertEqual(Inflector::singularize('waxes'), 'wax');
 		$this->assertEqual(Inflector::singularize('waves'), 'wave');
+		$this->assertEqual(Inflector::singularize('bureaus'), 'bureau');
 		$this->assertEqual(Inflector::singularize(''), '');
 	}
 /**
@@ -153,6 +154,7 @@ function testInflectingPlurals() {
 		$this->assertEqual(Inflector::pluralize('glove'), 'gloves');
 		$this->assertEqual(Inflector::pluralize('crisis'), 'crises');
 		$this->assertEqual(Inflector::pluralize('wave'), 'waves');
+		$this->assertEqual(Inflector::pluralize('bureau'), 'bureaus');
 		$this->assertEqual(Inflector::pluralize(''), '');
 	}
 /**
@@ -228,6 +230,7 @@ function testClassNaming() {
 		$this->assertEqual(Inflector::classify('artists_genres'), 'ArtistsGenre');
 		$this->assertEqual(Inflector::classify('file_systems'), 'FileSystem');
 		$this->assertEqual(Inflector::classify('news'), 'News');
+		$this->assertEqual(Inflector::classify('bureaus'), 'Bureau');
 	}
 /**
  * testTableNaming method
@@ -239,6 +242,7 @@ function testTableNaming() {
 		$this->assertEqual(Inflector::tableize('ArtistsGenre'), 'artists_genres');
 		$this->assertEqual(Inflector::tableize('FileSystem'), 'file_systems');
 		$this->assertEqual(Inflector::tableize('News'), 'news');
+		$this->assertEqual(Inflector::tableize('Bureau'), 'bureaus');
 	}
 /**
  * testHumanization method

From a67a97722a40283f0f3a430fdf0ac12ac095b4c3 Mon Sep 17 00:00:00 2001
From: ceeram <mayl@planet.nl>
Date: Fri, 13 Nov 2009 14:36:33 +0100
Subject: [PATCH 095/244] refs #291

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/inflector.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index 71f07b4e3..863072dfd 100644
--- a/cake/libs/inflector.php
+++ b/cake/libs/inflector.php
@@ -305,6 +305,7 @@ function __initSingularRules() {
 			'/(m)en$/i' => '\1an',
 			'/(c)hildren$/i' => '\1\2hild',
 			'/(n)ews$/i' => '\1\2ews',
+			'/eaus$/' => 'eau',
 			'/^(.*us)$/' => '\\1',
 			'/s$/i' => '');
 

From d302ed1bfa86fe24a1c441c50a790ee4c364fd49 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 13 Nov 2009 09:44:51 -0500
Subject: [PATCH 096/244] Fixing comment block formatting.

---
 cake/tests/cases/libs/model/model_read.test.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php
index 74def2ae4..2a183d159 100644
--- a/cake/tests/cases/libs/model/model_read.test.php
+++ b/cake/tests/cases/libs/model/model_read.test.php
@@ -4899,13 +4899,12 @@ function testCallbackDisabling() {
 		$expected = array('mariano', 'nate', 'larry', 'garrett');
 		$this->assertEqual($result, $expected);
 	}
-
-	/**
-	 * Tests that the database configuration assigned to the model can be changed using
-	 * (before|after)Find callbacks
-	 *
-	 * @return void
-	 */
+/**
+ * Tests that the database configuration assigned to the model can be changed using
+ * (before|after)Find callbacks
+ *
+ * @return void
+ */
 	function testCallbackSourceChange() {
 		$this->loadFixtures('Post');
 		$TestModel = new Post();
@@ -4915,7 +4914,6 @@ function testCallbackSourceChange() {
 		$this->expectError(new PatternExpectation('/Only variable references/i'));
 		$this->assertFalse($TestModel->find('all', array('connection' => 'foo')));
 	}
-
 /**
  * testMultipleBelongsToWithSameClass method
  *

From 8d407ac9152e587347457461487bf7e0a7ee0012 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 13 Nov 2009 09:45:25 -0500
Subject: [PATCH 097/244] Adding test to form helper to increase code coverage.

---
 cake/tests/cases/libs/view/helpers/form.test.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index a0241322f..c1d90823a 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -4633,6 +4633,21 @@ function testFormCreate() {
 			'/fieldset'
 		);
 		$this->assertTags($result, $expected);
+
+		$this->Form->data = array();
+		$this->Form->params['controller'] = 'contacts';
+		$this->Form->params['models'] = array('Contact');
+		$result = $this->Form->create(array('url' => array('action' => 'index', 'param')));
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactAddForm', 'method' => 'post', 'action' => '/contacts/index/param'
+			),
+			'fieldset' => array('style' => 'preg:/display\s*\:\s*none;\s*/'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/fieldset'
+		);
+		$this->assertTags($result, $expected);
+		
 	}
 /**
  * Test base form url when url param is passed with multiple parameters (&)

From 9376826aa4232a103494166de1a60a84671c2064 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 13 Nov 2009 14:42:40 -0500
Subject: [PATCH 098/244] Fixing HttpSocket::buildUri when host key is empty.
 Tests added Fixes #271

---
 cake/libs/http_socket.php                  | 4 ++--
 cake/tests/cases/libs/http_socket.test.php | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index 793618ece..97d2e080b 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -564,7 +564,8 @@ function buildUri($uri = array(), $uriTemplate = '%scheme://%user:%pass@%host:%p
 		$stripIfEmpty = array(
 			'query' => '?%query',
 			'fragment' => '#%fragment',
-			'user' => '%user:%pass@'
+			'user' => '%user:%pass@',
+			'host' => '%host:%port/'
 		);
 
 		foreach ($stripIfEmpty as $key => $strip) {
@@ -577,7 +578,6 @@ function buildUri($uri = array(), $uriTemplate = '%scheme://%user:%pass@%host:%p
 		if (array_key_exists($uri['scheme'], $defaultPorts) && $defaultPorts[$uri['scheme']] == $uri['port']) {
 			$uriTemplate = str_replace(':%port', null, $uriTemplate);
 		}
-
 		foreach ($uri as $property => $value) {
 			$uriTemplate = str_replace('%'.$property, $value, $uriTemplate);
 		}
diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php
index 2dbc193d9..581e1c697 100644
--- a/cake/tests/cases/libs/http_socket.test.php
+++ b/cake/tests/cases/libs/http_socket.test.php
@@ -925,6 +925,9 @@ function testBuildUri() {
 		$r = $this->Socket->buildUri(array('host' => 'www.cakephp.org', 'port' => 23));
 		$this->assertIdentical($r, 'http://www.cakephp.org:23/');
 
+		$r = $this->Socket->buildUri(array('path' => 'www.google.com/search', 'query' => 'q=cakephp'));
+		$this->assertIdentical($r, 'http://www.google.com/search?q=cakephp');
+
 		$r = $this->Socket->buildUri(array('host' => 'www.cakephp.org', 'scheme' => 'https', 'port' => 79));
 		$this->assertIdentical($r, 'https://www.cakephp.org:79/');
 

From 8b1a2b1f728b11b759359f334f963e6c490e6ff8 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 16:29:33 -0500
Subject: [PATCH 099/244] Applying optimization in Router::__parseExtension
 from 'robustsolution'.  Fixes #301

---
 cake/libs/router.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/libs/router.php b/cake/libs/router.php
index 0b2b3b61c..579b3ff4a 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -562,6 +562,7 @@ function __parseExtension($url) {
 						if (strcasecmp($name, $match) === 0) {
 							$url = substr($url, 0, strpos($url, '.' . $name));
 							$ext = $match;
+							break;
 						}
 					}
 				}

From 06d4e5e5531b1fcee464495fa6e83a372e3cb904 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 18:50:23 -0500
Subject: [PATCH 100/244] Reformatting code in memcache. Adding unset() to test
 case to remove unnecessary keys that can cause test failure.

---
 cake/libs/cache/memcache.php                  |  9 ++++++---
 cake/tests/cases/libs/cache/memcache.test.php | 16 +++++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php
index 2d70a6e86..831cfa2ed 100644
--- a/cake/libs/cache/memcache.php
+++ b/cake/libs/cache/memcache.php
@@ -61,7 +61,10 @@ function init($settings = array()) {
 			return false;
 		}
 		parent::init(array_merge(array(
-			'engine'=> 'Memcache', 'prefix' => Inflector::slug(APP_DIR) . '_', 'servers' => array('127.0.0.1'), 'compress'=> false
+			'engine'=> 'Memcache', 
+			'prefix' => Inflector::slug(APP_DIR) . '_', 
+			'servers' => array('127.0.0.1'),
+			'compress'=> false
 			), $settings)
 		);
 
@@ -100,7 +103,7 @@ function init($settings = array()) {
  */
 	function write($key, &$value, $duration) {
 		$expires = time() + $duration;
-		$this->__Memcache->set($key.'_expires', $expires, $this->settings['compress'], $expires);
+		$this->__Memcache->set($key . '_expires', $expires, $this->settings['compress'], $expires);
 		return $this->__Memcache->set($key, $value, $this->settings['compress'], $expires);
 	}
 /**
@@ -112,7 +115,7 @@ function write($key, &$value, $duration) {
  */
 	function read($key) {
 		$time = time();
-		$cachetime = intval($this->__Memcache->get($key.'_expires'));
+		$cachetime = intval($this->__Memcache->get($key . '_expires'));
 		if ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime) {
 			return false;
 		}
diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/cake/tests/cases/libs/cache/memcache.test.php
index 8a48df86c..d26f360e8 100644
--- a/cake/tests/cases/libs/cache/memcache.test.php
+++ b/cake/tests/cases/libs/cache/memcache.test.php
@@ -82,13 +82,15 @@ function tearDown() {
  */
 	function testSettings() {
 		$settings = Cache::settings();
-		$expecting = array('prefix' => 'cake_',
-						'duration'=> 3600,
-						'probability' => 100,
-						'servers' => array('127.0.0.1'),
-						'compress' => false,
-						'engine' => 'Memcache'
-						);
+		unset($settings['serialize'], $settings['path']);
+		$expecting = array(
+			'prefix' => 'cake_',
+			'duration'=> 3600,
+			'probability' => 100,
+			'servers' => array('127.0.0.1'),
+			'compress' => false,
+			'engine' => 'Memcache'
+		);
 		$this->assertEqual($settings, $expecting);
 	}
 /**

From 862ff82ad48ef613df33447697e6b2f33903d464 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 15 Nov 2009 01:00:22 +0530
Subject: [PATCH 101/244] Updating Configure::store to fix escaping issues

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/configure.php                  | 15 +--------------
 cake/tests/cases/libs/configure.test.php |  7 +++++--
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 985890cfe..22d0e3fe6 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -459,20 +459,7 @@ function store($type, $name, $data = array()) {
 		$content = '';
 
 		foreach ($data as $key => $value) {
-			$content .= "\$config['$type']['$key']";
-
-			if (is_array($value)) {
-				$content .= " = array(";
-
-				foreach ($value as $key1 => $value2) {
-					$value2 = addslashes($value2);
-					$content .= "'$key1' => '$value2', ";
-				}
-				$content .= ");\n";
-			} else {
-				$value = addslashes($value);
-				$content .= " = '$value';\n";
-			}
+			$content .= "\$config['$type']['$key'] = " . var_export($value, true) . ";\n";
 		}
 		if (is_null($type)) {
 			$write = false;
diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
index e29f5042b..54f1aa59c 100644
--- a/cake/tests/cases/libs/configure.test.php
+++ b/cake/tests/cases/libs/configure.test.php
@@ -224,14 +224,17 @@ function testLoad() {
 	function testStoreAndLoad() {
 		Configure::write('Cache.disable', false);
 
-		$expected = array('data' => 'value');
+		$expected = array('data' => 'value with backslash \, \'singlequote\' and "doublequotes"');
 		Configure::store('SomeExample', 'test', $expected);
 
 		Configure::load('test');
 		$config = Configure::read('SomeExample');
 		$this->assertEqual($config, $expected);
 
-		$expected = array('data' => array('first' => 'value', 'second' => 'value2'));
+		$expected = array(
+			'data' => array('first' => 'value with backslash \, \'singlequote\' and "doublequotes"', 'second' => 'value2'),
+			'data2' => 'value'
+		);
 		Configure::store('AnotherExample', 'test.config', $expected);
 
 		Configure::load('test.config');

From 17e377de7e3aa668a0809ecd656171a9e4de187d Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 14 Nov 2009 19:40:30 -0500
Subject: [PATCH 102/244] Updating doc block for MemcacheEngine

---
 cake/libs/cache/memcache.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php
index 831cfa2ed..4c87c10c2 100644
--- a/cake/libs/cache/memcache.php
+++ b/cake/libs/cache/memcache.php
@@ -38,9 +38,11 @@ class MemcacheEngine extends CacheEngine {
  */
 	var $__Memcache = null;
 /**
- * settings
- * 		servers = string or array of memcache servers, default => 127.0.0.1
- * 		compress = boolean, default => false
+ * Settings
+ *
+ *  - servers = string or array of memcache servers, default => 127.0.0.1. If an
+ *    array MemcacheEngine will use them as a pool.
+ *  - compress = boolean, default => false
  *
  * @var array
  * @access public

From 6039d6ebe495533107711b7c1117081476d0718c Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 15:32:58 -0500
Subject: [PATCH 103/244] Applying optimization in Dispatcher::parseParams()
 from 'robustsolution'.  Fixes #309

---
 cake/dispatcher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index b2b1d81d4..c6be13c7d 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -271,7 +271,7 @@ function parseParams($fromUrl) {
 				$params['form']['_method'] = env('HTTP_X_HTTP_METHOD_OVERRIDE');
 			}
 			if (isset($params['form']['_method'])) {
-				if (isset($_SERVER) && !empty($_SERVER)) {
+				if (!empty($_SERVER)) {
 					$_SERVER['REQUEST_METHOD'] = $params['form']['_method'];
 				} else {
 					$_ENV['REQUEST_METHOD'] = $params['form']['_method'];

From ea6e3dd0763f4d4b310df79190918dd4fedd9f30 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 16:47:58 -0500
Subject: [PATCH 104/244] Fixing issue with bake model <name>

---
 cake/console/libs/tasks/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index b962a13df..0292f74ae 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -65,6 +65,7 @@ function execute() {
 
 		if (!empty($this->args[0])) {
 			$model = Inflector::camelize($this->args[0]);
+			$this->useDbConfig = 'default';
 			if ($this->bake($model)) {
 				if ($this->_checkUnitTest()) {
 					$this->bakeTest($model);

From 63ab96d751a7308fdb65c13d43a1a237bbc09eee Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 15 Nov 2009 17:48:41 -0500
Subject: [PATCH 105/244] Setting $primary = false inside
 DboSource::queryAssociation.  Fixed #208

---
 cake/libs/model/datasources/dbo_source.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 013a5baee..ec154f25e 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -798,12 +798,12 @@ function queryAssociation(&$model, &$linkModel, $type, $association, $assocData,
 					if (count($ins) > 1) {
 						$query = str_replace('{$__cakeID__$}', '(' .join(', ', $ins) .')', $query);
 						$query = str_replace('= (', 'IN (', $query);
-						$query = str_replace('=	 (', 'IN (', $query);
+						$query = str_replace('= (', 'IN (', $query);
 					} else {
 						$query = str_replace('{$__cakeID__$}',$ins[0], $query);
 					}
 
-					$query = str_replace('	WHERE 1 = 1', '', $query);
+					$query = str_replace(' WHERE 1 = 1', '', $query);
 				}
 
 				$foreignKey = $model->hasAndBelongsToMany[$association]['foreignKey'];
@@ -877,7 +877,7 @@ function queryAssociation(&$model, &$linkModel, $type, $association, $assocData,
 						$this->__mergeAssociation($resultSet[$i], $fetch, $association, $type, $selfJoin);
 					}
 					if (isset($resultSet[$i][$association])) {
-						$resultSet[$i][$association] = $linkModel->afterFind($resultSet[$i][$association]);
+						$resultSet[$i][$association] = $linkModel->afterFind($resultSet[$i][$association], false);
 					}
 				} else {
 					$tempArray[0][$association] = false;
@@ -898,7 +898,7 @@ function fetchAssociated($model, $query, $ids) {
 		$query = str_replace('{$__cakeID__$}', join(', ', $ids), $query);
 		if (count($ids) > 1) {
 			$query = str_replace('= (', 'IN (', $query);
-			$query = str_replace('=	 (', 'IN (', $query);
+			$query = str_replace('= (', 'IN (', $query);
 		}
 		return $this->fetchAll($query, $model->cacheQueries, $model->alias);
 	}

From 9eb195064674851e630a4323eb8ce6b1f2e827f3 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 16 Nov 2009 20:10:08 -0500
Subject: [PATCH 106/244] Removing duplicate condition check. Fixes #314

---
 cake/libs/router.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cake/libs/router.php b/cake/libs/router.php
index 579b3ff4a..6bb72b440 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -581,10 +581,6 @@ function __parseExtension($url) {
  * @access private
  */
 	function __connectDefaultRoutes() {
-		if ($this->__defaultsMapped) {
-			return;
-		}
-
 		if ($this->__admin) {
 			$params = array('prefix' => $this->__admin, $this->__admin => true);
 		}

From 4a8808eb211261073114faa130101ee8b44b9307 Mon Sep 17 00:00:00 2001
From: "renan.saddam" <renan.saddam@gmail.com>
Date: Thu, 19 Nov 2009 16:28:11 -0200
Subject: [PATCH 107/244] Removing the argument passed to
 mssql_get_last_message(), it does not accept any argument.

---
 cake/libs/model/datasources/dbo/dbo_mssql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index b93192f95..9e5cad49a 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -412,7 +412,7 @@ function update(&$model, $fields = array(), $values = null, $conditions = null)
  * @return string Error message with error number
  */
 	function lastError() {
-		$error = mssql_get_last_message($this->connection);
+		$error = mssql_get_last_message();
 
 		if ($error) {
 			if (!preg_match('/contexto de la base de datos a|contesto di database|changed database|datenbankkontext/i', $error)) {

From 9dcac18b87739e3e46100ef7b29e4651093091e4 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 21 Nov 2009 13:26:33 -0500
Subject: [PATCH 108/244] Adding commented Asset.timestamp block to core.php

---
 app/config/core.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/config/core.php b/app/config/core.php
index fbd02e74a..cac5eb8ab 100644
--- a/app/config/core.php
+++ b/app/config/core.php
@@ -149,6 +149,15 @@
  * A random string used in security hashing methods.
  */
 	Configure::write('Security.salt', 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi');
+/**
+ * Apply timestamps with the last modified time to static assets (js, css, images).
+ * Will append a querysting parameter containing the time the file was modified. This is
+ * useful for invalidating browser caches.
+ *
+ * Set to `true` to apply timestamps, when debug = 0, or set to 'force' to always enable
+ * timestamping.
+ */
+	//Configure::write('Asset.timestamp', true);
 /**
  * Compress CSS output by removing comments, whitespace, repeating tags, etc.
  * This requires a/var/cache directory to be writable by the web server for caching.

From 9b6b258fede89ec09275234270fe6ee0e2d61af1 Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Thu, 19 Nov 2009 20:04:32 -0200
Subject: [PATCH 109/244] Replace function is_integer (alias) by is_int.

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/controller/components/cookie.php | 2 +-
 cake/libs/view/helpers/time.php            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php
index 56713f5c4..f84770922 100644
--- a/cake/libs/controller/components/cookie.php
+++ b/cake/libs/controller/components/cookie.php
@@ -348,7 +348,7 @@ function __expire($expires = null) {
 			return $this->__expires;
 		}
 		$this->__reset = $this->__expires;
-		if (is_integer($expires) || is_numeric($expires)) {
+		if (is_int($expires) || is_numeric($expires)) {
 			return $this->__expires = $now + intval($expires);
 		}
 		return $this->__expires = strtotime($expires, $now);
diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php
index 179ca4409..fbd5cef7e 100644
--- a/cake/libs/view/helpers/time.php
+++ b/cake/libs/view/helpers/time.php
@@ -63,7 +63,7 @@ function fromString($dateString, $userOffset = null) {
 		if (empty($dateString)) {
 			return false;
 		}
-		if (is_integer($dateString) || is_numeric($dateString)) {
+		if (is_int($dateString) || is_numeric($dateString)) {
 			$date = intval($dateString);
 		} else {
 			$date = strtotime($dateString);

From 1acc60b04cfb3d601ee561662cfd5f30d71e0b5e Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Thu, 19 Nov 2009 20:05:59 -0200
Subject: [PATCH 110/244] Replace function die (alias) by exit.

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/console/libs/templates/skel/config/acl.ini.php | 2 +-
 cake/console/libs/templates/skel/webroot/css.php    | 4 ++--
 cake/console/libs/templates/skel/webroot/test.php   | 2 +-
 cake/libs/debugger.php                              | 2 +-
 cake/libs/model/datasources/dbo/dbo_odbc.php        | 2 +-
 cake/tests/test_app/config/acl.ini.php              | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cake/console/libs/templates/skel/config/acl.ini.php b/cake/console/libs/templates/skel/config/acl.ini.php
index a9868e685..ee585c27a 100644
--- a/cake/console/libs/templates/skel/config/acl.ini.php
+++ b/cake/console/libs/templates/skel/config/acl.ini.php
@@ -1,4 +1,4 @@
-;<?php die() ?>
+;<?php exit() ?>
 ; SVN FILE: $Id$
 ;/**
 ; * Short description for file.
diff --git a/cake/console/libs/templates/skel/webroot/css.php b/cake/console/libs/templates/skel/webroot/css.php
index 52b57fee7..8c5e9ab0a 100644
--- a/cake/console/libs/templates/skel/webroot/css.php
+++ b/cake/console/libs/templates/skel/webroot/css.php
@@ -66,7 +66,7 @@ function write_css_cache($path, $content) {
 	}
 
 	if (preg_match('|\.\.|', $url) || !preg_match('|^ccss/(.+)$|i', $url, $regs)) {
-		die('Wrong file name.');
+		exit('Wrong file name.');
 	}
 
 	$filename = 'css/' . $regs[1];
@@ -74,7 +74,7 @@ function write_css_cache($path, $content) {
 	$cachepath = CACHE . 'css' . DS . str_replace(array('/','\\'), '-', $regs[1]);
 
 	if (!file_exists($filepath)) {
-		die('Wrong file name.');
+		exit('Wrong file name.');
 	}
 
 	if (file_exists($cachepath)) {
diff --git a/cake/console/libs/templates/skel/webroot/test.php b/cake/console/libs/templates/skel/webroot/test.php
index a57d15747..1d668947b 100644
--- a/cake/console/libs/templates/skel/webroot/test.php
+++ b/cake/console/libs/templates/skel/webroot/test.php
@@ -95,7 +95,7 @@
 require_once CAKE_TESTS_LIB . 'test_manager.php';
 
 if (Configure::read('debug') < 1) {
-	die(__('Debug setting does not allow access to this url.', true));
+	exit(__('Debug setting does not allow access to this url.', true));
 }
 
 if (!isset($_SERVER['SERVER_NAME'])) {
diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php
index a49b39abb..b5693da97 100644
--- a/cake/libs/debugger.php
+++ b/cake/libs/debugger.php
@@ -218,7 +218,7 @@ function handleError($code, $description, $file = null, $line = null, $context =
 		}
 
 		if ($error == 'Fatal Error') {
-			die();
+			exit();
 		}
 		return true;
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_odbc.php b/cake/libs/model/datasources/dbo/dbo_odbc.php
index e68948668..c6af41d25 100644
--- a/cake/libs/model/datasources/dbo/dbo_odbc.php
+++ b/cake/libs/model/datasources/dbo/dbo_odbc.php
@@ -95,7 +95,7 @@ function connect() {
 			$connect = 'odbc_connect';
 		}
 		if (!function_exists($connect)) {
-			die('no odbc?');
+			exit('no odbc?');
 		}
 		$this->connected = false;
 		$this->connection = $connect($config['database'], $config['login'], $config['password'],  SQL_CUR_USE_ODBC);
diff --git a/cake/tests/test_app/config/acl.ini.php b/cake/tests/test_app/config/acl.ini.php
index 351f02c99..9ac2b5d60 100644
--- a/cake/tests/test_app/config/acl.ini.php
+++ b/cake/tests/test_app/config/acl.ini.php
@@ -1,4 +1,4 @@
-;<?php die() ?>
+;<?php exit() ?>
 ; SVN FILE: $Id$
 ;/**
 ; * Test App Ini Based Acl Config File

From df9e1e0bd1a1445e3854c41f5af6d1f2a7679476 Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Thu, 19 Nov 2009 20:13:35 -0200
Subject: [PATCH 111/244] Replace function join (alias) by implode.

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/basics.php                               |  4 +-
 cake/console/libs/console.php                 |  2 +-
 cake/console/libs/tasks/controller.php        |  6 +--
 cake/console/libs/tasks/extract.php           | 14 +++----
 cake/console/libs/tasks/model.php             | 12 +++---
 .../skel/controllers/pages_controller.php     |  2 +-
 cake/libs/controller/components/security.php  |  2 +-
 cake/libs/controller/pages_controller.php     |  2 +-
 cake/libs/debugger.php                        |  8 ++--
 cake/libs/flay.php                            |  2 +-
 cake/libs/http_socket.php                     |  8 ++--
 cake/libs/inflector.php                       |  8 ++--
 cake/libs/model/behaviors/containable.php     |  2 +-
 cake/libs/model/datasources/dbo/dbo_mssql.php |  4 +-
 cake/libs/model/datasources/dbo/dbo_mysql.php |  8 ++--
 .../libs/model/datasources/dbo/dbo_oracle.php |  8 ++--
 .../model/datasources/dbo/dbo_postgres.php    | 10 ++---
 .../libs/model/datasources/dbo/dbo_sqlite.php |  4 +-
 cake/libs/model/datasources/dbo_source.php    | 38 +++++++++----------
 cake/libs/model/model.php                     |  4 +-
 cake/libs/model/schema.php                    | 10 ++---
 cake/libs/router.php                          |  8 ++--
 cake/libs/set.php                             |  2 +-
 cake/libs/view/helper.php                     |  4 +-
 cake/libs/view/helpers/ajax.php               |  8 ++--
 cake/libs/view/helpers/form.php               |  6 +--
 cake/libs/view/helpers/html.php               | 12 +++---
 cake/libs/view/helpers/javascript.php         |  4 +-
 cake/libs/view/helpers/js.php                 |  8 ++--
 cake/libs/view/helpers/rss.php                |  4 +-
 cake/libs/view/view.php                       |  2 +-
 cake/tests/lib/cake_test_case.php             |  4 +-
 cake/tests/lib/test_manager.php               |  2 +-
 33 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/cake/basics.php b/cake/basics.php
index 8a9c7b527..0659d28ec 100644
--- a/cake/basics.php
+++ b/cake/basics.php
@@ -423,7 +423,7 @@ function env($key) {
 /**
  * Writes data into file.
  *
- * If file exists, it will be overwritten. If data is an array, it will be join()ed with an empty string.
+ * If file exists, it will be overwritten. If data is an array, it will be implode()ed with an empty string.
  *
  * @param string $fileName File name.
  * @param mixed  $data String or array.
@@ -431,7 +431,7 @@ function env($key) {
  */
 	function file_put_contents($fileName, $data) {
 		if (is_array($data)) {
-			$data = join('', $data);
+			$data = implode('', $data);
 		}
 		$res = @fopen($fileName, 'w+b');
 
diff --git a/cake/console/libs/console.php b/cake/console/libs/console.php
index 19b075092..189da32e8 100644
--- a/cake/console/libs/console.php
+++ b/cake/console/libs/console.php
@@ -286,7 +286,7 @@ function main($command = null) {
 				break;
 				case (preg_match("/^routes\s+show/i", $command, $tmp) == true):
 					$router =& Router::getInstance();
-					$this->out(join("\n", Set::extract($router->routes, '{n}.0')));
+					$this->out(implode("\n", Set::extract($router->routes, '{n}.0')));
 				break;
 				case (preg_match("/^route\s+(.*)/i", $command, $tmp) == true):
 					$this->out(var_export(Router::parse($tmp[1]), true));
diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index c49735ed8..428cdcebe 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -126,7 +126,7 @@ function __interactive($controllerName = false) {
 		if (file_exists($this->path . $controllerFile .'_controller.php')) {
 			$question[] = sprintf(__("Warning: Choosing no will overwrite the %sController.", true), $controllerName);
 		}
-		$doItInteractive = $this->in(join("\n", $question), array('y','n'), 'y');
+		$doItInteractive = $this->in(implode("\n", $question), array('y','n'), 'y');
 
 		if (strtolower($doItInteractive) == 'y' || strtolower($doItInteractive) == 'yes') {
 			$this->interactive = true;
@@ -313,7 +313,7 @@ function bakeActions($controllerName, $admin = null, $wannaUseSession = true) {
 			}
 		}
 		if (!empty($compact)) {
-			$actions .= "\t\t\$this->set(compact(" . join(', ', $compact) . "));\n";
+			$actions .= "\t\t\$this->set(compact(" . implode(', ', $compact) . "));\n";
 		}
 		$actions .= "\t}\n";
 		$actions .= "\n";
@@ -365,7 +365,7 @@ function bakeActions($controllerName, $admin = null, $wannaUseSession = true) {
 			}
 		}
 		if (!empty($compact)) {
-			$actions .= "\t\t\$this->set(compact(" . join(',', $compact) . "));\n";
+			$actions .= "\t\t\$this->set(compact(" . implode(',', $compact) . "));\n";
 		}
 		$actions .= "\t}\n";
 		$actions .= "\n";
diff --git a/cake/console/libs/tasks/extract.php b/cake/console/libs/tasks/extract.php
index 7918e8cd7..1e4f75e9e 100644
--- a/cake/console/libs/tasks/extract.php
+++ b/cake/console/libs/tasks/extract.php
@@ -414,13 +414,13 @@ function __buildFiles() {
 
 			if ($this->__oneFile === true) {
 				foreach ($fileInfo as $file => $lines) {
-					$occured[] = "$file:" . join(';', $lines);
+					$occured[] = "$file:" . implode(';', $lines);
 
 					if (isset($this->__fileVersions[$file])) {
 						$fileList[] = $this->__fileVersions[$file];
 					}
 				}
-				$occurances = join("\n#: ", $occured);
+				$occurances = implode("\n#: ", $occured);
 				$occurances = str_replace($this->path, '', $occurances);
 				$output = "#: $occurances\n";
 				$filename = $this->__filename;
@@ -439,12 +439,12 @@ function __buildFiles() {
 			} else {
 				foreach ($fileInfo as $file => $lines) {
 					$filename = $str;
-					$occured = array("$str:" . join(';', $lines));
+					$occured = array("$str:" . implode(';', $lines));
 
 					if (isset($this->__fileVersions[$str])) {
 						$fileList[] = $this->__fileVersions[$str];
 					}
-					$occurances = join("\n#: ", $occured);
+					$occurances = implode("\n#: ", $occured);
 					$occurances = str_replace($this->path, '', $occurances);
 					$output .= "#: $occurances\n";
 
@@ -511,9 +511,9 @@ function __writeFiles() {
 			$fileList = str_replace(array($this->path), '', $fileList);
 
 			if (count($fileList) > 1) {
-				$fileList = "Generated from files:\n#  " . join("\n#  ", $fileList);
+				$fileList = "Generated from files:\n#  " . implode("\n#  ", $fileList);
 			} elseif (count($fileList) == 1) {
-				$fileList = 'Generated from file: ' . join('', $fileList);
+				$fileList = 'Generated from file: ' . implode('', $fileList);
 			} else {
 				$fileList = 'No version information was available in the source files.';
 			}
@@ -535,7 +535,7 @@ function __writeFiles() {
 				}
 			}
 			$fp = fopen($this->__output . $file, 'w');
-			fwrite($fp, str_replace('--VERSIONS--', $fileList, join('', $content)));
+			fwrite($fp, str_replace('--VERSIONS--', $fileList, implode('', $content)));
 			fclose($fp);
 		}
 	}
diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index 0292f74ae..654911932 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -700,7 +700,7 @@ function bakeTest($className, $useTable = null, $associations = array()) {
 					}
 				}
 			}
-			$fixture = join(", ", $fixture);
+			$fixture = implode(", ", $fixture);
 
 			$import = $className;
 			if (isset($this->plugin)) {
@@ -904,24 +904,24 @@ function fixture($model, $useTable = null) {
 							}
 							$records[] = "\t\t'$field' => $insert";
 							unset($value['type']);
-							$col .= join(', ',  $schema->__values($value));
+							$col .= implode(', ',  $schema->__values($value));
 						} else {
 							$col = "\t\t'indexes' => array(";
 							$props = array();
 							foreach ((array)$value as $key => $index) {
-								$props[] = "'{$key}' => array(" . join(', ',  $schema->__values($index)) . ")";
+								$props[] = "'{$key}' => array(" . implode(', ',  $schema->__values($index)) . ")";
 							}
-							$col .= join(', ', $props);
+							$col .= implode(', ', $props);
 						}
 						$col .= ")";
 						$cols[] = $col;
 					}
-					$out .= join(",\n", $cols);
+					$out .= implode(",\n", $cols);
 				}
 				$out .= "\n\t);\n";
 			}
 		}
-		$records = join(",\n", $records);
+		$records = implode(",\n", $records);
 		$out .= "\tvar \$records = array(array(\n$records\n\t));\n";
 		$out .= "}\n";
 		$path = TESTS . DS . 'fixtures' . DS;
diff --git a/cake/console/libs/templates/skel/controllers/pages_controller.php b/cake/console/libs/templates/skel/controllers/pages_controller.php
index 8196616ba..7013b6e17 100644
--- a/cake/console/libs/templates/skel/controllers/pages_controller.php
+++ b/cake/console/libs/templates/skel/controllers/pages_controller.php
@@ -79,7 +79,7 @@ function display() {
 			$title = Inflector::humanize($path[$count - 1]);
 		}
 		$this->set(compact('page', 'subpage', 'title'));
-		$this->render(join('/', $path));
+		$this->render(implode('/', $path));
 	}
 }
 
diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index 64e0af936..2e44f45e6 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -327,7 +327,7 @@ function loginRequest($options = array()) {
 			$out[] = 'opaque="' . md5($options['realm']).'"';
 		}
 
-		return $auth . ' ' . join(',', $out);
+		return $auth . ' ' . implode(',', $out);
 	}
 /**
  * Parses an HTTP digest authentication response, and returns an array of the data, or null on failure.
diff --git a/cake/libs/controller/pages_controller.php b/cake/libs/controller/pages_controller.php
index 8196616ba..7013b6e17 100644
--- a/cake/libs/controller/pages_controller.php
+++ b/cake/libs/controller/pages_controller.php
@@ -79,7 +79,7 @@ function display() {
 			$title = Inflector::humanize($path[$count - 1]);
 		}
 		$this->set(compact('page', 'subpage', 'title'));
-		$this->render(join('/', $path));
+		$this->render(implode('/', $path));
 	}
 }
 
diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php
index b5693da97..42d47916c 100644
--- a/cake/libs/debugger.php
+++ b/cake/libs/debugger.php
@@ -275,7 +275,7 @@ function trace($options = array()) {
 						foreach ($next['args'] as $arg) {
 							$args[] = Debugger::exportVar($arg);
 						}
-						$function .= join(', ', $args);
+						$function .= implode(', ', $args);
 					}
 					$function .= ')';
 				}
@@ -297,7 +297,7 @@ function trace($options = array()) {
 		if ($options['format'] == 'array' || $options['format'] == 'points') {
 			return $back;
 		}
-		return join("\n", $back);
+		return implode("\n", $back);
 	}
 /**
  * Shortens file paths by replacing the application base path with 'APP', and the CakePHP core
@@ -406,7 +406,7 @@ function exportVar($var, $recursion = 0) {
 				if (count($vars) > 0) {
 					$n = "\n";
 				}
-				return $out . join(",", $vars) . "{$n})";
+				return $out . implode(",", $vars) . "{$n})";
 			break;
 			case 'resource':
 				return strtolower(gettype($var));
@@ -444,7 +444,7 @@ function __object($var) {
 				$out[] = "$className::$$key = " . $value;
 			}
 		}
-		return join("\n", $out);
+		return implode("\n", $out);
 	}
 /**
  * Handles object conversion to debug string.
diff --git a/cake/libs/flay.php b/cake/libs/flay.php
index ed23cf7f4..7d33b4a5e 100644
--- a/cake/libs/flay.php
+++ b/cake/libs/flay.php
@@ -217,7 +217,7 @@ function markedSnippets($words, $string, $max_snippets = 5) {
 		if (count($snips) > $max_snippets) {
 			$snips = array_slice($snips, 0, $max_snippets);
 		}
-		$joined = join(' <b>...</b> ', $snips);
+		$joined = implode(' <b>...</b> ', $snips);
 		$snips = $joined ? "<b>...</b> {$joined} <b>...</b>" : substr($string, 0, 80) . '<b>...</b>';
 		return $this->colorMark($words, $snips);
 	}
diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index 97d2e080b..d0bf021df 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -738,7 +738,7 @@ function buildRequestLine($request = array(), $versionToken = 'HTTP/1.1') {
 		$request['uri'] = $this->buildUri($request['uri'], '/%path?%query');
 
 		if (!$this->quirksMode && $request['uri'] === '*' && !in_array($request['method'], $asteriskMethods)) {
-			trigger_error(sprintf(__('HttpSocket::buildRequestLine - The "*" asterisk character is only allowed for the following methods: %s. Activate quirks mode to work outside of HTTP/1.1 specs.', true), join(',', $asteriskMethods)), E_USER_WARNING);
+			trigger_error(sprintf(__('HttpSocket::buildRequestLine - The "*" asterisk character is only allowed for the following methods: %s. Activate quirks mode to work outside of HTTP/1.1 specs.', true), implode(',', $asteriskMethods)), E_USER_WARNING);
 			return false;
 		}
 		return $request['method'].' '.$request['uri'].' '.$versionToken.$this->lineBreak;
@@ -776,7 +776,7 @@ function buildHeader($header, $mode = 'standard') {
 		$returnHeader = '';
 		foreach ($header as $field => $contents) {
 			if (is_array($contents) && $mode == 'standard') {
-				$contents = join(',', $contents);
+				$contents = implode(',', $contents);
 			}
 			foreach ((array)$contents as $content) {
 				$contents = preg_replace("/\r\n(?![\t ])/", "\r\n ", $content);
@@ -921,7 +921,7 @@ function loadCookies() {
  * @todo Test $chars parameter
  */
 	function unescapeToken($token, $chars = null) {
-		$regex = '/"(['.join('', $this->__tokenEscapeChars(true, $chars)).'])"/';
+		$regex = '/"(['.implode('', $this->__tokenEscapeChars(true, $chars)).'])"/';
 		$token = preg_replace($regex, '\\1', $token);
 		return $token;
 	}
@@ -934,7 +934,7 @@ function unescapeToken($token, $chars = null) {
  * @todo Test $chars parameter
  */
 	function escapeToken($token, $chars = null) {
-		$regex = '/(['.join('', $this->__tokenEscapeChars(true, $chars)).'])/';
+		$regex = '/(['.implode('', $this->__tokenEscapeChars(true, $chars)).'])/';
 		$token = preg_replace($regex, '"\\1"', $token);
 		return $token;
 	}
diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index 863072dfd..66a9f10bd 100644
--- a/cake/libs/inflector.php
+++ b/cake/libs/inflector.php
@@ -243,8 +243,8 @@ function pluralize($word) {
 		extract($_this->pluralRules);
 
 		if (!isset($regexUninflected) || !isset($regexIrregular)) {
-			$regexUninflected = __enclose(join( '|', $uninflected));
-			$regexIrregular = __enclose(join( '|', array_keys($irregular)));
+			$regexUninflected = __enclose(implode( '|', $uninflected));
+			$regexIrregular = __enclose(implode( '|', array_keys($irregular)));
 			$_this->pluralRules['regexUninflected'] = $regexUninflected;
 			$_this->pluralRules['regexIrregular'] = $regexIrregular;
 		}
@@ -383,8 +383,8 @@ function singularize($word) {
 		extract($_this->singularRules);
 
 		if (!isset($regexUninflected) || !isset($regexIrregular)) {
-			$regexUninflected = __enclose(join( '|', $uninflected));
-			$regexIrregular = __enclose(join( '|', array_keys($irregular)));
+			$regexUninflected = __enclose(implode( '|', $uninflected));
+			$regexIrregular = __enclose(implode( '|', array_keys($irregular)));
 			$_this->singularRules['regexUninflected'] = $regexUninflected;
 			$_this->singularRules['regexIrregular'] = $regexIrregular;
 		}
diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php
index 9bec011a2..b5e8eadf9 100644
--- a/cake/libs/model/behaviors/containable.php
+++ b/cake/libs/model/behaviors/containable.php
@@ -283,7 +283,7 @@ function containments(&$Model, $contain, $containments = array(), $throwErrors =
 			if (strpos($name, '.') !== false) {
 				$chain = explode('.', $name);
 				$name = array_shift($chain);
-				$children = array(join('.', $chain) => $children);
+				$children = array(implode('.', $chain) => $children);
 			}
 
 			$children = (array)$children;
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index 9e5cad49a..09e9d1ab7 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -591,7 +591,7 @@ function renderStatement($type, $data) {
 
 				foreach (array('columns', 'indexes') as $var) {
 					if (is_array(${$var})) {
-						${$var} = "\t" . join(",\n\t", array_filter(${$var}));
+						${$var} = "\t" . implode(",\n\t", array_filter(${$var}));
 					}
 				}
 				return "CREATE TABLE {$table} (\n{$columns});\n{$indexes}";
@@ -719,7 +719,7 @@ function buildIndex($indexes, $table = null) {
 				$out = "ALTER TABLE {$table} ADD CONSTRAINT {$name} UNIQUE";
 
 				if (is_array($value['column'])) {
-					$value['column'] = join(', ', array_map(array(&$this, 'name'), $value['column']));
+					$value['column'] = implode(', ', array_map(array(&$this, 'name'), $value['column']));
 				} else {
 					$value['column'] = $this->name($value['column']);
 				}
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index ef61cb675..395d2a78f 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -141,7 +141,7 @@ function update(&$model, $fields = array(), $values = null, $conditions = null)
 
 		$alias = $joins = false;
 		$fields = $this->_prepareUpdateFields($model, $combined, empty($conditions), !empty($conditions));
-		$fields = join(', ', $fields);
+		$fields = implode(', ', $fields);
 		$table = $this->fullTableName($model);
 
 		if (!empty($conditions)) {
@@ -281,7 +281,7 @@ function alterSchema($compare, $table = null) {
 					}
 				}
 				$colList = array_merge($colList, $this->_alterIndexes($curTable, $indexes));
-				$out .= "\t" . join(",\n\t", $colList) . ";\n\n";
+				$out .= "\t" . implode(",\n\t", $colList) . ";\n\n";
 			}
 		}
 		return $out;
@@ -339,7 +339,7 @@ function _alterIndexes($table, $indexes) {
 					}
 				}
 				if (is_array($value['column'])) {
-					$out .= 'KEY '. $name .' (' . join(', ', array_map(array(&$this, 'name'), $value['column'])) . ')';
+					$out .= 'KEY '. $name .' (' . implode(', ', array_map(array(&$this, 'name'), $value['column'])) . ')';
 				} else {
 					$out .= 'KEY '. $name .' (' . $this->name($value['column']) . ')';
 				}
@@ -358,7 +358,7 @@ function _alterIndexes($table, $indexes) {
 	function insertMulti($table, $fields, $values) {
 		$table = $this->fullTableName($table);
 		if (is_array($fields)) {
-			$fields = join(', ', array_map(array(&$this, 'name'), $fields));
+			$fields = implode(', ', array_map(array(&$this, 'name'), $fields));
 		}
 		$values = implode(', ', $values);
 		$this->query("INSERT INTO {$table} ({$fields}) VALUES {$values}");
diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
index a71a4b1e2..92c81e897 100644
--- a/cake/libs/model/datasources/dbo/dbo_oracle.php
+++ b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -704,7 +704,7 @@ function alterSchema($compare, $table = null) {
 						break;
 					}
 				}
-				$out .= "\t" . join(",\n\t", $colList) . ";\n\n";
+				$out .= "\t" . implode(",\n\t", $colList) . ";\n\n";
 			}
 		}
 		return $out;
@@ -925,7 +925,7 @@ function renderStatement($type, $data) {
 			case 'schema':
 				foreach (array('columns', 'indexes') as $var) {
 					if (is_array(${$var})) {
-						${$var} = "\t" . join(",\n\t", array_filter(${$var}));
+						${$var} = "\t" . implode(",\n\t", array_filter(${$var}));
 					}
 				}
 				if (trim($indexes) != '') {
@@ -977,7 +977,7 @@ function queryAssociation(&$model, &$linkModel, $type, $association, $assocData,
 					$fetch = array();
 					$ins = array_chunk($ins, 1000);
 					foreach ($ins as $i) {
-						$q = str_replace('{$__cakeID__$}', join(', ', $i), $query);
+						$q = str_replace('{$__cakeID__$}', implode(', ', $i), $query);
 						$q = str_replace('= (', 'IN (', $q);
 						$res = $this->fetchAll($q, $model->cacheQueries, $model->alias);
 						$fetch = array_merge($fetch, $res);
@@ -1021,7 +1021,7 @@ function queryAssociation(&$model, &$linkModel, $type, $association, $assocData,
 					$fetch = array();
 					$ins = array_chunk($ins, 1000);
 					foreach ($ins as $i) {
-						$q = str_replace('{$__cakeID__$}', '(' .join(', ', $i) .')', $query);
+						$q = str_replace('{$__cakeID__$}', '(' .implode(', ', $i) .')', $query);
 						$q = str_replace('= (', 'IN (', $q);
 						$q = str_replace('  WHERE 1 = 1', '', $q);
 
diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index 3ea5d8fa0..9dc21da27 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -539,11 +539,11 @@ function alterSchema($compare, $table = null) {
 				}
 				
 				if (!empty($colList)) {
-					$out .= "\t" . join(",\n\t", $colList) . ";\n\n";
+					$out .= "\t" . implode(",\n\t", $colList) . ";\n\n";
 				} else {
 					$out = '';
 				}
-				$out .= join(";\n\t", $this->_alterIndexes($curTable, $indexes)) . ";";
+				$out .= implode(";\n\t", $this->_alterIndexes($curTable, $indexes)) . ";";
 			}
 		}
 		return $out;
@@ -580,7 +580,7 @@ function _alterIndexes($table, $indexes) {
 					$out .= 'INDEX ';
 				}
 				if (is_array($value['column'])) {
-					$out .= $name . ' ON ' . $table . ' (' . join(', ', array_map(array(&$this, 'name'), $value['column'])) . ')';
+					$out .= $name . ' ON ' . $table . ' (' . implode(', ', array_map(array(&$this, 'name'), $value['column'])) . ')';
 				} else {
 					$out .= $name . ' ON ' . $table . ' (' . $this->name($value['column']) . ')';
 				}
@@ -829,7 +829,7 @@ function buildIndex($indexes, $table = null) {
 					$out .= 'UNIQUE ';
 				}
 				if (is_array($value['column'])) {
-					$value['column'] = join(', ', array_map(array(&$this, 'name'), $value['column']));
+					$value['column'] = implode(', ', array_map(array(&$this, 'name'), $value['column']));
 				} else {
 					$value['column'] = $this->name($value['column']);
 				}
@@ -862,7 +862,7 @@ function renderStatement($type, $data) {
 
 				foreach (array('columns', 'indexes') as $var) {
 					if (is_array(${$var})) {
-						${$var} = join($join[$var], array_filter(${$var}));
+						${$var} = implode($join[$var], array_filter(${$var}));
 					}
 				}
 				return "CREATE TABLE {$table} (\n\t{$columns}\n);\n{$indexes}";
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index 005ffc6fe..1423aadcf 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -529,7 +529,7 @@ function buildIndex($indexes, $table = null) {
 				$out .= 'UNIQUE ';
 			}
 			if (is_array($value['column'])) {
-				$value['column'] = join(', ', array_map(array(&$this, 'name'), $value['column']));
+				$value['column'] = implode(', ', array_map(array(&$this, 'name'), $value['column']));
 			} else {
 				$value['column'] = $this->name($value['column']);
 			}
@@ -589,7 +589,7 @@ function renderStatement($type, $data) {
 
 				foreach (array('columns', 'indexes') as $var) {
 					if (is_array(${$var})) {
-						${$var} = "\t" . join(",\n\t", array_filter(${$var}));
+						${$var} = "\t" . implode(",\n\t", array_filter(${$var}));
 					}
 				}
 				return "CREATE TABLE {$table} (\n{$columns});\n{$indexes}";
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index ec154f25e..a48a3c6a2 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -580,8 +580,8 @@ function create(&$model, $fields = null, $values = null) {
 		}
 		$query = array(
 			'table' => $this->fullTableName($model),
-			'fields' => join(', ', $fieldInsert),
-			'values' => join(', ', $valueInsert)
+			'fields' => implode(', ', $fieldInsert),
+			'values' => implode(', ', $valueInsert)
 		);
 
 		if ($this->execute($this->renderStatement('create', $query))) {
@@ -796,7 +796,7 @@ function queryAssociation(&$model, &$linkModel, $type, $association, $assocData,
 				}
 				if (!empty($ins)) {
 					if (count($ins) > 1) {
-						$query = str_replace('{$__cakeID__$}', '(' .join(', ', $ins) .')', $query);
+						$query = str_replace('{$__cakeID__$}', '(' .implode(', ', $ins) .')', $query);
 						$query = str_replace('= (', 'IN (', $query);
 						$query = str_replace('= (', 'IN (', $query);
 					} else {
@@ -895,7 +895,7 @@ function queryAssociation(&$model, &$linkModel, $type, $association, $assocData,
  * @return array Association results
  */
 	function fetchAssociated($model, $query, $ids) {
-		$query = str_replace('{$__cakeID__$}', join(', ', $ids), $query);
+		$query = str_replace('{$__cakeID__$}', implode(', ', $ids), $query);
 		if (count($ids) > 1) {
 			$query = str_replace('= (', 'IN (', $query);
 			$query = str_replace('= (', 'IN (', $query);
@@ -1272,12 +1272,12 @@ function buildStatement($query, $model) {
 		}
 		return $this->renderStatement('select', array(
 			'conditions' => $this->conditions($query['conditions'], true, true, $model),
-			'fields' => join(', ', $query['fields']),
+			'fields' => implode(', ', $query['fields']),
 			'table' => $query['table'],
 			'alias' => $this->alias . $this->name($query['alias']),
 			'order' => $this->order($query['order']),
 			'limit' => $this->limit($query['limit'], $query['offset']),
-			'joins' => join(' ', $query['joins']),
+			'joins' => implode(' ', $query['joins']),
 			'group' => $this->group($query['group'])
 		));
 	}
@@ -1324,7 +1324,7 @@ function renderStatement($type, $data) {
 			case 'schema':
 				foreach (array('columns', 'indexes') as $var) {
 					if (is_array(${$var})) {
-						${$var} = "\t" . join(",\n\t", array_filter(${$var}));
+						${$var} = "\t" . implode(",\n\t", array_filter(${$var}));
 					}
 				}
 				if (trim($indexes) != '') {
@@ -1378,7 +1378,7 @@ function update(&$model, $fields = array(), $values = null, $conditions = null)
 		} else {
 			$combined = array_combine($fields, $values);
 		}
-		$fields = join(', ', $this->_prepareUpdateFields($model, $combined, empty($conditions)));
+		$fields = implode(', ', $this->_prepareUpdateFields($model, $combined, empty($conditions)));
 
 		$alias = $joins = null;
 		$table = $this->fullTableName($model);
@@ -1728,7 +1728,7 @@ function fields(&$model, $alias = null, $fields = array(), $quote = true) {
 						} else {
 							$field[0] = explode('.', $field[1]);
 							if (!Set::numeric($field[0])) {
-								$field[0] = join('.', array_map(array($this, 'name'), $field[0]));
+								$field[0] = implode('.', array_map(array($this, 'name'), $field[0]));
 								$fields[$i] = preg_replace('/\(' . $field[1] . '\)/', '(' . $field[0] . ')', $fields[$i], 1);
 							}
 						}
@@ -1760,7 +1760,7 @@ function conditions($conditions, $quoteValues = true, $where = true, $model = nu
 			if (empty($out)) {
 				return $clause . ' 1 = 1';
 			}
-			return $clause . join(' AND ', $out);
+			return $clause . implode(' AND ', $out);
 		}
 
 		if (empty($conditions) || trim($conditions) == '' || $conditions === true) {
@@ -1829,7 +1829,7 @@ function conditionKeysToString($conditions, $quoteValues = true, $model = null)
 						$out[] = $value[0] ;
 					}
 				} else {
-					$out[] = '(' . $not . '(' . join(') ' . strtoupper($key) . ' (', $value) . '))';
+					$out[] = '(' . $not . '(' . implode(') ' . strtoupper($key) . ' (', $value) . '))';
 				}
 
 			} else {
@@ -1856,13 +1856,13 @@ function conditionKeysToString($conditions, $quoteValues = true, $model = null)
 							if (is_object($model)) {
 								$columnType = $model->getColumnType($key);
 							}
-							$data .= join(', ', $this->value($value, $columnType));
+							$data .= implode(', ', $this->value($value, $columnType));
 						}
 						$data .= ')';
 					} else {
 						$ret = $this->conditionKeysToString($value, $quoteValues, $model);
 						if (count($ret) > 1) {
-							$data = '(' . join(') AND (', $ret) . ')';
+							$data = '(' . implode(') AND (', $ret) . ')';
 						} elseif (isset($ret[0])) {
 							$data = $ret[0];
 						}
@@ -1896,7 +1896,7 @@ function conditionKeysToString($conditions, $quoteValues = true, $model = null)
  * @access private
  */
 	function __parseKey($model, $key, $value) {
-		$operatorMatch = '/^((' . join(')|(', $this->__sqlOps);
+		$operatorMatch = '/^((' . implode(')|(', $this->__sqlOps);
 		$operatorMatch .= '\\x20)|<[>=]?(?![^>]+>)\\x20?|[>=!]{1,3}(?!<)\\x20?)/is';
 		$bound = (strpos($key, '?') !== false || (is_array($value) && strpos($key, ':') !== false));
 
@@ -1942,7 +1942,7 @@ function __parseKey($model, $key, $value) {
 		$operator = trim($operator);
 
 		if (is_array($value)) {
-			$value = join(', ', $value);
+			$value = implode(', ', $value);
 
 			switch ($operator) {
 				case '=':
@@ -2069,7 +2069,7 @@ function order($keys, $direction = 'ASC') {
 				}
 				$order[] = $this->order($key . $value);
 			}
-			return ' ORDER BY ' . trim(str_replace('ORDER BY', '', join(',', $order)));
+			return ' ORDER BY ' . trim(str_replace('ORDER BY', '', implode(',', $order)));
 		}
 		$keys = preg_replace('/ORDER\\x20BY/i', '', $keys);
 
@@ -2100,7 +2100,7 @@ function order($keys, $direction = 'ASC') {
 	function group($group) {
 		if ($group) {
 			if (is_array($group)) {
-				$group = join(', ', $group);
+				$group = implode(', ', $group);
 			}
 			return ' GROUP BY ' . $this->__quoteFields($group);
 		}
@@ -2224,7 +2224,7 @@ function boolean($data) {
 	function insertMulti($table, $fields, $values) {
 		$table = $this->fullTableName($table);
 		if (is_array($fields)) {
-			$fields = join(', ', array_map(array(&$this, 'name'), $fields));
+			$fields = implode(', ', array_map(array(&$this, 'name'), $fields));
 		}
 		$count = count($values);
 		for ($x = 0; $x < $count; $x++) {
@@ -2396,7 +2396,7 @@ function buildIndex($indexes, $table = null) {
 				$name = $this->startQuote . $name . $this->endQuote;
 			}
 			if (is_array($value['column'])) {
-				$out .= 'KEY ' . $name . ' (' . join(', ', array_map(array(&$this, 'name'), $value['column'])) . ')';
+				$out .= 'KEY ' . $name . ' (' . implode(', ', array_map(array(&$this, 'name'), $value['column'])) . ')';
 			} else {
 				$out .= 'KEY ' . $name . ' (' . $this->name($value['column']) . ')';
 			}
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 4f1934def..bfc24f4ba 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1340,7 +1340,7 @@ function __saveMulti($joined, $id) {
 						if ($isUUID && $primaryAdded) {
 							$values[] = $db->value(String::uuid());
 						}
-						$values = join(',', $values);
+						$values = implode(',', $values);
 						$newValues[] = "({$values})";
 						unset($values);
 					} elseif (isset($row[$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
@@ -1368,7 +1368,7 @@ function __saveMulti($joined, $id) {
 				}
 
 				if (!empty($newValues)) {
-					$fields =  join(',', $fields);
+					$fields =  implode(',', $fields);
 					$db->insertMulti($this->{$join}, $fields, $newValues);
 				}
 			}
diff --git a/cake/libs/model/schema.php b/cake/libs/model/schema.php
index d03689926..d607dbf57 100644
--- a/cake/libs/model/schema.php
+++ b/cake/libs/model/schema.php
@@ -334,19 +334,19 @@ function write($object, $options = array()) {
 							}
 							$col = "\t\t'{$field}' => array('type' => '" . $value['type'] . "', ";
 							unset($value['type']);
-							$col .= join(', ',  $this->__values($value));
+							$col .= implode(', ',  $this->__values($value));
 						} else {
 							$col = "\t\t'indexes' => array(";
 							$props = array();
 							foreach ((array)$value as $key => $index) {
-								$props[] = "'{$key}' => array(" . join(', ',  $this->__values($index)) . ")";
+								$props[] = "'{$key}' => array(" . implode(', ',  $this->__values($index)) . ")";
 							}
-							$col .= join(', ', $props);
+							$col .= implode(', ', $props);
 						}
 						$col .= ")";
 						$cols[] = $col;
 					}
-					$out .= join(",\n", $cols);
+					$out .= implode(",\n", $cols);
 				}
 				$out .= "\n\t);\n";
 			}
@@ -447,7 +447,7 @@ function __values($values) {
 		if (is_array($values)) {
 			foreach ($values as $key => $val) {
 				if (is_array($val)) {
-					$vals[] = "'{$key}' => array('" . join("', '",  $val) . "')";
+					$vals[] = "'{$key}' => array('" . implode("', '",  $val) . "')";
 				} else if (!is_numeric($key)) {
 					$val = var_export($val, true);
 					$vals[] = "'{$key}' => {$val}";
diff --git a/cake/libs/router.php b/cake/libs/router.php
index 6bb72b440..083787c69 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -378,7 +378,7 @@ function writeRoute($route, $default, $params) {
 				$parsed[] = '/' . $element;
 			}
 		}
-		return array('#^' . join('', $parsed) . '[\/]*$#', $names);
+		return array('#^' . implode('', $parsed) . '[\/]*$#', $names);
 	}
 /**
  * Returns the list of prefixes used in connected routes
@@ -880,11 +880,11 @@ function url($url = null, $full = false) {
 				if ($_this->__admin && isset($url[$_this->__admin])) {
 					array_unshift($urlOut, $_this->__admin);
 				}
-				$output = join('/', $urlOut) . '/';
+				$output = implode('/', $urlOut) . '/';
 			}
 
 			if (!empty($args)) {
-				$args = join('/', $args);
+				$args = implode('/', $args);
 				if ($output{strlen($output) - 1} != '/') {
 					$args = '/'. $args;
 				}
@@ -1066,7 +1066,7 @@ function __mapRoute($route, $params = array()) {
 				for ($i = 0; $i < $count; $i++) {
 					$named[] = $keys[$i] . $this->named['separator'] . $params['named'][$keys[$i]];
 				}
-				$params['named'] = join('/', $named);
+				$params['named'] = implode('/', $named);
 			}
 			$params['pass'] = str_replace('//', '/', $params['pass'] . '/' . $params['named']);
 		}
diff --git a/cake/libs/set.php b/cake/libs/set.php
index 230e22fad..11382e4dc 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -413,7 +413,7 @@ function extract($path, $data = null, $options = array()) {
 					if (count($context['trace']) == 1) {
 						$context['trace'][] = $context['key'];
 					}
-					$parent = join('/', $context['trace']) . '/.';
+					$parent = implode('/', $context['trace']) . '/.';
 					$context['item'] = Set::extract($parent, $data);
 					$context['key'] = array_pop($context['trace']);
 					if (isset($context['trace'][1]) && $context['trace'][1] > 0) {
diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
index 076622c73..3cdec2c2f 100644
--- a/cake/libs/view/helper.php
+++ b/cake/libs/view/helper.php
@@ -313,7 +313,7 @@ function setEntity($entity, $setScope = false) {
 
 		if ($setScope) {
 			$view->modelScope = false;
-		} elseif (join('.', $view->entity()) == $entity) {
+		} elseif (implode('.', $view->entity()) == $entity) {
 			return;
 		}
 
@@ -530,7 +530,7 @@ function __name($options = array(), $field = null, $key = 'name') {
 				$name = $field;
 			break;
 			default:
-				$name = 'data[' . join('][', $view->entity()) . ']';
+				$name = 'data[' . implode('][', $view->entity()) . ']';
 			break;
 		}
 
diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php
index ed0de9782..d2eda08db 100644
--- a/cake/libs/view/helpers/ajax.php
+++ b/cake/libs/view/helpers/ajax.php
@@ -251,7 +251,7 @@ function remoteFunction($options) {
 				$options['requestHeaders'] = array();
 			}
 			if (is_array($options['update'])) {
-				$options['update'] = join(' ', $options['update']);
+				$options['update'] = implode(' ', $options['update']);
 			}
 			$options['requestHeaders']['X-Update'] = $options['update'];
 		} else {
@@ -799,7 +799,7 @@ function __optionsForAjax($options) {
 						$keys[] = "'" . $key . "'";
 						$keys[] = "'" . $val . "'";
 					}
-					$jsOptions['requestHeaders'] = '[' . join(', ', $keys) . ']';
+					$jsOptions['requestHeaders'] = '[' . implode(', ', $keys) . ']';
 				break;
 			}
 		}
@@ -846,7 +846,7 @@ function _buildOptions($options, $acceptable) {
 				}
 			}
 
-			$out = join(', ', $out);
+			$out = implode(', ', $out);
 			$out = '{' . $out . '}';
 			return $out;
 		} else {
@@ -965,7 +965,7 @@ function afterRender() {
 						$data[] = $key . ':"' . rawurlencode($val) . '"';
 					}
 				}
-				$out  = 'var __ajaxUpdater__ = {' . join(", \n", $data) . '};' . "\n";
+				$out  = 'var __ajaxUpdater__ = {' . implode(", \n", $data) . '};' . "\n";
 				$out .= 'for (n in __ajaxUpdater__) { if (typeof __ajaxUpdater__[n] == "string"';
 				$out .= ' && $(n)) Element.update($(n), unescape(decodeURIComponent(';
 				$out .= '__ajaxUpdater__[n]))); }';
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index e1f3c4422..6e47d44cf 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -355,7 +355,7 @@ function __secure($field = null, $value = null) {
 				}
 			}
 		}
-		$field = join('.', $field);
+		$field = implode('.', $field);
 		if (!in_array($field, $this->fields)) {
 			if ($value !== null) {
 				return $this->fields[$field] = $value;
@@ -585,7 +585,7 @@ function inputs($fields = null, $blacklist = null) {
 	function input($fieldName, $options = array()) {
 		$view =& ClassRegistry::getObject('view');
 		$this->setEntity($fieldName);
-		$entity = join('.', $view->entity());
+		$entity = implode('.', $view->entity());
 
 		$defaults = array('before' => null, 'between' => null, 'after' => null);
 		$options = array_merge($defaults, $options);
@@ -952,7 +952,7 @@ function radio($fieldName, $options = array(), $attributes = array()) {
 				'id' => $attributes['id'] . '_', 'value' => '', 'name' => $attributes['name']
 			));
 		}
-		$out = $hidden . join($inbetween, $out);
+		$out = $hidden . implode($inbetween, $out);
 
 		if ($legend) {
 			$out = sprintf(
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index 8ef8406ec..b5be53a74 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -398,9 +398,9 @@ function style($data, $inline = true) {
 			$out[] = $key.':'.$value.';';
 		}
 		if ($inline) {
-			return join(' ', $out);
+			return implode(' ', $out);
 		}
-		return join("\n", $out);
+		return implode("\n", $out);
 	}
 /**
  * Returns the breadcrumb trail as a sequence of &raquo;-separated links.
@@ -423,7 +423,7 @@ function getCrumbs($separator = '&raquo;', $startText = false) {
 					$out[] = $crumb[0];
 				}
 			}
-			return $this->output(join($separator, $out));
+			return $this->output(implode($separator, $out));
 		} else {
 			return null;
 		}
@@ -481,7 +481,7 @@ function tableHeaders($names, $trOptions = null, $thOptions = null) {
 		foreach ($names as $arg) {
 			$out[] = sprintf($this->tags['tableheader'], $this->_parseAttributes($thOptions), $arg);
 		}
-		$data = sprintf($this->tags['tablerow'], $this->_parseAttributes($trOptions), join(' ', $out));
+		$data = sprintf($this->tags['tablerow'], $this->_parseAttributes($trOptions), implode(' ', $out));
 		return $this->output($data);
 	}
 /**
@@ -531,9 +531,9 @@ function tableCells($data, $oddTrOptions = null, $evenTrOptions = null, $useCoun
 				$cellsOut[] = sprintf($this->tags['tablecell'], $this->_parseAttributes($cellOptions), $cell);
 			}
 			$options = $this->_parseAttributes($count % 2 ? $oddTrOptions : $evenTrOptions);
-			$out[] = sprintf($this->tags['tablerow'], $options, join(' ', $cellsOut));
+			$out[] = sprintf($this->tags['tablerow'], $options, implode(' ', $cellsOut));
 		}
-		return $this->output(join("\n", $out));
+		return $this->output(implode("\n", $out));
 	}
 /**
  * Returns a formatted block tag, i.e DIV, SPAN, P.
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index aa8d7577f..ec68f6580 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -649,9 +649,9 @@ function object($data = array(), $options = array(), $prefix = null, $postfix =
 			}
 
 			if (!$numeric) {
-				$rt = '{' . join(',', $out) . '}';
+				$rt = '{' . implode(',', $out) . '}';
 			} else {
-				$rt = '[' . join(',', $out) . ']';
+				$rt = '[' . implode(',', $out) . ']';
 			}
 		}
 		$rt = $options['prefix'] . $rt . $options['postfix'];
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
index 15e25099f..b13bc9c33 100644
--- a/cake/libs/view/helpers/js.php
+++ b/cake/libs/view/helpers/js.php
@@ -128,7 +128,7 @@ function load_($url = null, $options = array()) {
 				$options['requestHeaders'] = array();
 			}
 			if (is_array($options['update'])) {
-				$options['update'] = join(' ', $options['update']);
+				$options['update'] = implode(' ', $options['update']);
 			}
 			$options['requestHeaders']['X-Update'] = $options['update'];
 		} else {
@@ -257,9 +257,9 @@ function object($data = array(), $block = false, $prefix = '', $postfix = '', $s
 		}
 
 		if (!$numeric) {
-			$rt = '{' . join(', ', $out) . '}';
+			$rt = '{' . implode(', ', $out) . '}';
 		} else {
-			$rt = '[' . join(', ', $out) . ']';
+			$rt = '[' . implode(', ', $out) . ']';
 		}
 		$rt = $prefix . $rt . $postfix;
 
@@ -445,7 +445,7 @@ function __options($opts) {
 			}
 			$options[] = $key . ':' . $val;
 		}
-		return join(', ', $options);
+		return implode(', ', $options);
 	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/libs/view/helpers/rss.php b/cake/libs/view/helpers/rss.php
index a7889a2e0..5b8cb8362 100644
--- a/cake/libs/view/helpers/rss.php
+++ b/cake/libs/view/helpers/rss.php
@@ -209,7 +209,7 @@ function item($att = array(), $elements = array()) {
 							}
 							$categories[] = $this->elem($key, $attrib, $category);
 						}
-						$elements[$key] = join('', $categories);
+						$elements[$key] = implode('', $categories);
 						continue 2;
 					} else if (is_array($val) && isset($val['domain'])) {
 						$attrib['domain'] = $val['domain'];
@@ -259,7 +259,7 @@ function item($att = array(), $elements = array()) {
 			$elements[$key] = $this->elem($key, $attrib, $val);
 		}
 		if (!empty($elements)) {
-			$content = join('', $elements);
+			$content = implode('', $elements);
 		}
 		return $this->output($this->elem('item', $att, $content, !($content === null)));
 	}
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 199359f9f..655e6d266 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -437,7 +437,7 @@ function renderLayout($content_for_layout, $layout = null) {
 		$data_for_layout = array_merge($this->viewVars, array(
 			'title_for_layout' => $pageTitle,
 			'content_for_layout' => $content_for_layout,
-			'scripts_for_layout' => join("\n\t", $this->__scripts),
+			'scripts_for_layout' => implode("\n\t", $this->__scripts),
 			'cakeDebug' => $debug
 		));
 
diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php
index f642e36a1..c0d0bc451 100644
--- a/cake/tests/lib/cake_test_case.php
+++ b/cake/tests/lib/cake_test_case.php
@@ -634,10 +634,10 @@ function assertTags($string, $expected, $fullDebug = false) {
 					$permutations = $this->__array_permute($attrs);
 					$permutationTokens = array();
 					foreach ($permutations as $permutation) {
-						$permutationTokens[] = join('', $permutation);
+						$permutationTokens[] = implode('', $permutation);
 					}
 					$regex[] = array(
-						sprintf('%s', join(', ', $explanations)),
+						sprintf('%s', implode(', ', $explanations)),
 						$permutationTokens,
 						$i,
 					);
diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php
index d614ed6d0..00e540571 100644
--- a/cake/tests/lib/test_manager.php
+++ b/cake/tests/lib/test_manager.php
@@ -575,7 +575,7 @@ function &getTestCaseList() {
 		foreach ($testCases as $testCaseFile => $testCase) {
 			$title = explode(strpos($testCase, '\\') ? '\\' : '/', str_replace('.test.php', '', $testCase));
 			$title[count($title) - 1] = Inflector::camelize($title[count($title) - 1]);
-			$title = join(' / ', $title);
+			$title = implode(' / ', $title);
 
 				$buffer .= "<li><a href='" . $manager->getBaseURL() . "?case=" . urlencode($testCase) . $urlExtra ."'>" . $title . "</a></li>\n";
 		}

From 911a99bf232b81ac320f59add5f9a8d0a2e6e198 Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Thu, 19 Nov 2009 20:16:26 -0200
Subject: [PATCH 112/244] Replace function preg_split by explode when possible.

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/dispatcher.php       | 2 +-
 cake/libs/http_socket.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index c6be13c7d..f09e10997 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -515,7 +515,7 @@ function uri() {
 			if (key($_GET) && strpos(key($_GET), '?') !== false) {
 				unset($_GET[key($_GET)]);
 			}
-			$uri = preg_split('/\?/', $uri, 2);
+			$uri = explode('?', $uri, 2);
 
 			if (isset($uri[1])) {
 				parse_str($uri[1], $_GET);
diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index d0bf021df..da8bd0268 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -854,7 +854,7 @@ function parseCookies($header) {
 		foreach ((array)$header['Set-Cookie'] as $cookie) {
 			if (strpos($cookie, '";"') !== false) {
 				$cookie = str_replace('";"', "{__cookie_replace__}", $cookie);
-				$parts  = str_replace("{__cookie_replace__}", '";"', preg_split('/\;/', $cookie));
+				$parts  = str_replace("{__cookie_replace__}", '";"', explode(';', $cookie));
 			} else {
 				$parts = preg_split('/\;[ \t]*/', $cookie);
 			}

From 1c0c1bc9c71da1ceb7bac9ea89fe0edf68d7dd25 Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Thu, 19 Nov 2009 20:17:47 -0200
Subject: [PATCH 113/244] Replace function split by explode when possible.

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/console/libs/tasks/extract.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/console/libs/tasks/extract.php b/cake/console/libs/tasks/extract.php
index 1e4f75e9e..a956afd4d 100644
--- a/cake/console/libs/tasks/extract.php
+++ b/cake/console/libs/tasks/extract.php
@@ -263,9 +263,9 @@ function __extractTokens() {
 				}
 
 				if (is_array($token)) {
-					$lineNumber += count(split("\n", $token[1])) - 1;
+					$lineNumber += count(explode("\n", $token[1])) - 1;
 				} else {
-					$lineNumber += count(split("\n", $token)) - 1;
+					$lineNumber += count(explode("\n", $token)) - 1;
 				}
 			}
 			unset($allTokens);

From 1cef0ac98120c74dc8738cef849184b095fe2e18 Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Thu, 19 Nov 2009 20:21:14 -0200
Subject: [PATCH 114/244] Little optimization in postConditions of controller.

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/controller/controller.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 273d51e23..66569bca1 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -899,12 +899,14 @@ function postConditions($data = array(), $op = null, $bool = 'AND', $exclusive =
 			foreach ($fields as $field => $value) {
 				$key = $model.'.'.$field;
 				$fieldOp = $op;
-				if (is_array($op) && array_key_exists($key, $op)) {
-					$fieldOp = $op[$key];
-				} elseif (is_array($op) && array_key_exists($field, $op)) {
-					$fieldOp = $op[$field];
-				} elseif (is_array($op)) {
-					$fieldOp = false;
+				if (is_array($op)) {
+					if (array_key_exists($key, $op)) {
+						$fieldOp = $op[$key];
+					} elseif (array_key_exists($field, $op)) {
+						$fieldOp = $op[$field];
+					} else {
+						$fieldOp = false;
+					}
 				}
 				if ($exclusive && $fieldOp === false) {
 					continue;

From 52fcabc96aac26ca7fb618b822e05777395dabe5 Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Thu, 19 Nov 2009 20:24:10 -0200
Subject: [PATCH 115/244] Little optimization in redirect of controller.

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/controller/controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 66569bca1..ce1b114d7 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -604,7 +604,7 @@ function redirect($url, $status = null, $exit = true) {
 				504 => 'Gateway Time-out'
 			);
 			if (is_string($status)) {
-				$codes = array_combine(array_values($codes), array_keys($codes));
+				$codes = array_flip($codes);
 			}
 
 			if (isset($codes[$status])) {

From 71df8dbbba8ace80cd60b9019fc3ab65cca1df81 Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Thu, 19 Nov 2009 20:27:09 -0200
Subject: [PATCH 116/244] Replace function sizeof (alias) by count.

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/model/datasources/dbo/dbo_adodb.php      | 2 +-
 cake/libs/validation.php                           | 4 ++--
 cake/tests/cases/libs/model/behaviors/acl.test.php | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_adodb.php b/cake/libs/model/datasources/dbo/dbo_adodb.php
index 45fa4048e..7feda9885 100644
--- a/cake/libs/model/datasources/dbo/dbo_adodb.php
+++ b/cake/libs/model/datasources/dbo/dbo_adodb.php
@@ -216,7 +216,7 @@ function rollback(&$model) {
 	function listSources() {
 		$tables = $this->_adodb->MetaTables('TABLES');
 
-		if (!sizeof($tables) > 0) {
+		if (!count($tables) > 0) {
 			trigger_error(ERROR_NO_TABLE_LIST, E_USER_NOTICE);
 			exit;
 		}
diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index 6531d97d9..22a1d1f62 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -636,10 +636,10 @@ function multiple($check, $options = array()) {
 		if (empty($check)) {
 			return false;
 		}
-		if ($options['max'] && sizeof($check) > $options['max']) {
+		if ($options['max'] && count($check) > $options['max']) {
 			return false;
 		}
-		if ($options['min'] && sizeof($check) < $options['min']) {
+		if ($options['min'] && count($check) < $options['min']) {
 			return false;
 		}
 		if ($options['in'] && is_array($options['in'])) {
diff --git a/cake/tests/cases/libs/model/behaviors/acl.test.php b/cake/tests/cases/libs/model/behaviors/acl.test.php
index 3ca1974e3..4c8f70750 100644
--- a/cake/tests/cases/libs/model/behaviors/acl.test.php
+++ b/cake/tests/cases/libs/model/behaviors/acl.test.php
@@ -285,7 +285,7 @@ function testAfterSave() {
 		$this->assertEqual($result['Aro']['parent_id'], 5);
 
 		$node = $Person->node(array('model' => 'AclPerson', 'foreign_key' => 8));
-		$this->assertEqual(sizeof($node), 2);
+		$this->assertEqual(count($node), 2);
 		$this->assertEqual($node[0]['Aro']['parent_id'], 5);
 		$this->assertEqual($node[1]['Aro']['parent_id'], null);
 	}
@@ -315,7 +315,7 @@ function testAfterDelete() {
 		$Person->save($data);
 		$id = $Person->id;
 		$node = $Person->node();
-		$this->assertEqual(sizeof($node), 2);
+		$this->assertEqual(count($node), 2);
 		$this->assertEqual($node[0]['Aro']['parent_id'], 5);
 		$this->assertEqual($node[1]['Aro']['parent_id'], null);
 
@@ -362,7 +362,7 @@ function testNode() {
 		$Person->id = 2;
 		$result = $Person->node();
 		$this->assertTrue(is_array($result));
-		$this->assertEqual(sizeof($result), 1);
+		$this->assertEqual(count($result), 1);
 	}
 }
 ?>
\ No newline at end of file

From a96c157d948e2f3c1fa55b5d422121c323859626 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 21 Nov 2009 15:14:21 -0500
Subject: [PATCH 117/244] Applying optimizations to use of count() from
 'jrbasso'

---
 cake/libs/configure.php                    |  2 +-
 cake/libs/controller/components/acl.php    |  2 +-
 cake/libs/controller/controller.php        |  4 +-
 cake/libs/debugger.php                     |  2 +-
 cake/libs/folder.php                       |  2 +-
 cake/libs/model/connection_manager.php     |  2 +-
 cake/libs/model/datasources/dbo_source.php |  2 +-
 cake/libs/model/model.php                  |  2 +-
 cake/libs/multibyte.php                    | 91 +++++++++++++---------
 cake/libs/sanitize.php                     |  2 +-
 cake/libs/set.php                          |  2 +-
 cake/libs/view/helpers/html.php            |  2 +-
 cake/libs/xml.php                          |  8 +-
 13 files changed, 69 insertions(+), 54 deletions(-)

diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 22d0e3fe6..4f3388186 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -373,7 +373,7 @@ function delete($var = null) {
 		$_this =& Configure::getInstance();
 		$name = $_this->__configVarNames($var);
 
-		if (count($name) > 1) {
+		if (isset($name[1])) {
 			unset($_this->{$name[0]}[$name[1]]);
 		} else {
 			unset($_this->{$name[0]});
diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php
index d68c61f03..3501e0b63 100644
--- a/cake/libs/controller/components/acl.php
+++ b/cake/libs/controller/components/acl.php
@@ -349,7 +349,7 @@ function allow($aro, $aco, $actions = "*", $value = 1) {
 		}
 		list($save['aro_id'], $save['aco_id']) = array($perms['aro'], $perms['aco']);
 
-		if ($perms['link'] != null && count($perms['link']) > 0) {
+		if ($perms['link'] != null && !empty($perms['link'])) {
 			$save['id'] = $perms['link'][0][$this->Aro->Permission->alias]['id'];
 		} else {
 			unset($save['id']);
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index ce1b114d7..d391c2472 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -737,7 +737,7 @@ function validate() {
 	function validateErrors() {
 		$objects = func_get_args();
 
-		if (!count($objects)) {
+		if (empty($objects)) {
 			return false;
 		}
 
@@ -747,7 +747,7 @@ function validateErrors() {
 			$errors = array_merge($errors, $this->{$object->alias}->invalidFields());
 		}
 
-		return $this->validationErrors = (count($errors) ? $errors : false);
+		return $this->validationErrors = (!empty($errors) ? $errors : false);
 	}
 /**
  * Instantiates the correct view class, hands it its data, and uses it to render the view output.
diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php
index 42d47916c..873b8a23c 100644
--- a/cake/libs/debugger.php
+++ b/cake/libs/debugger.php
@@ -403,7 +403,7 @@ function exportVar($var, $recursion = 0) {
 					}
 				}
 				$n = null;
-				if (count($vars) > 0) {
+				if (!empty($vars)) {
 					$n = "\n";
 				}
 				return $out . implode(",", $vars) . "{$n})";
diff --git a/cake/libs/folder.php b/cake/libs/folder.php
index a5331f80f..54856531c 100644
--- a/cake/libs/folder.php
+++ b/cake/libs/folder.php
@@ -744,7 +744,7 @@ function realpath($path) {
 				continue;
 			}
 			if ($part === '..') {
-				if (count($newparts) > 0) {
+				if (!empty($newparts)) {
 					array_pop($newparts);
 					continue;
 				} else {
diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php
index 575348822..a0db47226 100644
--- a/cake/libs/model/connection_manager.php
+++ b/cake/libs/model/connection_manager.php
@@ -135,7 +135,7 @@ function sourceList() {
 	function getSourceName(&$source) {
 		$_this =& ConnectionManager::getInstance();
 		$names = array_keys($_this->_dataSources);
-		for ($i = 0; $i < count($names); $i++) {
+		for ($i = 0, $count = count($names); $i < $count; $i++) {
 			if ($_this->_dataSources[$names[$i]] === $source) {
 				return $names[$i];
 			}
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index a48a3c6a2..ae8df2cbe 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -2039,7 +2039,7 @@ function order($keys, $direction = 'ASC') {
 			$keys = array_filter($keys);
 		}
 
-		if (empty($keys) || (is_array($keys) && count($keys) && isset($keys[0]) && empty($keys[0]))) {
+		if (empty($keys) || (is_array($keys) && isset($keys[0]) && empty($keys[0]))) {
 			return '';
 		}
 
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index bfc24f4ba..e688f1ea9 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1079,7 +1079,7 @@ function field($name, $conditions = null, $order = null) {
 					return $data[$name[0]][$name[1]];
 				}
 			}
-			if (isset($data[0]) && count($data[0]) > 0) {
+			if (!empty($data[0])) {
 				$name = key($data[0]);
 				return $data[0][$name];
 			}
diff --git a/cake/libs/multibyte.php b/cake/libs/multibyte.php
index 724b65923..1dfcd456b 100644
--- a/cake/libs/multibyte.php
+++ b/cake/libs/multibyte.php
@@ -36,7 +36,8 @@
  * @param string $needle The string to find in $haystack.
  * @param integer $offset The position in $haystack to start searching.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string, or false if $needle is not found.
+ * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string, or false 
+ *    if $needle is not found.
  */
 if (!function_exists('mb_stripos')) {
 	function mb_stripos($haystack, $needle, $offset = 0, $encoding = null) {
@@ -49,8 +50,9 @@ function mb_stripos($haystack, $needle, $offset = 0, $encoding = null) {
  * @param string $haystack The string from which to get the first occurrence of $needle.
  * @param string $needle The string to find in $haystack.
  * @param boolean $part Determines which portion of $haystack this function returns.
- *                If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
- *                If set to false, it returns all of $haystack from the first occurrence of $needle to the end, Default value is false.
+ *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end, 
+ *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
  * @return string|boolean The portion of $haystack, or false if $needle is not found.
  */
@@ -65,7 +67,7 @@ function mb_stristr($haystack, $needle, $part = false, $encoding = null) {
  * @param string $string The string being checked for length.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
  * @return integer The number of characters in string $string having character encoding encoding.
- *                 A multi-byte character is counted as 1.
+ *    A multi-byte character is counted as 1.
  */
 if (!function_exists('mb_strlen')) {
 	function mb_strlen($string, $encoding = null) {
@@ -80,7 +82,7 @@ function mb_strlen($string, $encoding = null) {
  * @param integer $offset The search offset. If it is not specified, 0 is used.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
  * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string.
- *                         If $needle is not found, it returns false.
+ *    If $needle is not found, it returns false.
  */
 if (!function_exists('mb_strpos')) {
 	function mb_strpos($haystack, $needle, $offset = 0, $encoding = null) {
@@ -93,8 +95,9 @@ function mb_strpos($haystack, $needle, $offset = 0, $encoding = null) {
  * @param string $haystack The string from which to get the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
  * @param boolean $part Determines which portion of $haystack this function returns.
- *                      If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
- *                      If set to false, it returns all of $haystack from the last occurrence of $needle to the end, Default value is false.
+ *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end, 
+ *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
  * @return string|boolean The portion of $haystack. or false if $needle is not found.
  */
@@ -109,8 +112,9 @@ function mb_strrchr($haystack, $needle, $part = false, $encoding = null) {
  * @param string $haystack The string from which to get the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
  * @param boolean $part Determines which portion of $haystack this function returns.
- *                      If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
- *                      If set to false, it returns all of $haystack from the last occurrence of $needle to the end, Default value is false.
+ *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end, 
+ *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
  * @return string|boolean The portion of $haystack. or false if $needle is not found.
  */
@@ -126,7 +130,8 @@ function mb_strrichr($haystack, $needle, $part = false, $encoding = null) {
  * @param string $needle The string to find in $haystack.
  * @param integer $offset The position in $haystack to start searching.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string, or false if $needle is not found.
+ * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string, 
+ *    or false if $needle is not found.
  */
 if (!function_exists('mb_strripos')) {
 	function mb_strripos($haystack, $needle, $offset = 0, $encoding = null) {
@@ -139,9 +144,10 @@ function mb_strripos($haystack, $needle, $offset = 0, $encoding = null) {
  * @param string $haystack The string being checked, for the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
  * @param integer $offset May be specified to begin searching an arbitrary number of characters into the string.
- *                        Negative values will stop searching at an arbitrary point prior to the end of the string.
+ *    Negative values will stop searching at an arbitrary point prior to the end of the string.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string. If $needle is not found, it returns false.
+ * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string. 
+ *    If $needle is not found, it returns false.
  */
 if (!function_exists('mb_strrpos')) {
 	function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null) {
@@ -154,8 +160,9 @@ function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null) {
  * @param string $haystack The string from which to get the first occurrence of $needle.
  * @param string $needle The string to find in $haystack
  * @param boolean $part Determines which portion of $haystack this function returns.
- *                      If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
- *                      If set to false, it returns all of $haystack from the first occurrence of $needle to the end, Default value is FALSE.
+ *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end, 
+ *    Default value is FALSE.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
  * @return string|boolean The portion of $haystack, or true if $needle is not found.
  */
@@ -220,12 +227,13 @@ function mb_substr($string, $start, $length = null, $encoding = null) {
  *
  * @param string $str The string being encoded
  * @param string $charset specifies the name of the character set in which str is represented in.
- * 						The default value is determined by the current NLS setting (mbstring.language).
- * @param string $transfer_encoding specifies the scheme of MIME encoding. It should be either "B" (Base64) or "Q" (Quoted-Printable).
- * 						Falls back to "B" if not given.
- * @param string $linefeed specifies the EOL (end-of-line) marker with which mb_encode_mimeheader() performs line-folding
- * 						(a » RFC term, the act of breaking a line longer than a certain length into multiple lines.
- * 						The length is currently hard-coded to 74 characters). Falls back to "\r\n" (CRLF) if not given.
+ *    The default value is determined by the current NLS setting (mbstring.language).
+ * @param string $transfer_encoding specifies the scheme of MIME encoding. 
+ *    It should be either "B" (Base64) or "Q" (Quoted-Printable). Falls back to "B" if not given.
+ * @param string $linefeed specifies the EOL (end-of-line) marker with which 
+ *    mb_encode_mimeheader() performs line-folding
+ *    (a » RFC term, the act of breaking a line longer than a certain length into multiple lines.
+ *    The length is currently hard-coded to 74 characters). Falls back to "\r\n" (CRLF) if not given.
  * @param integer $indent [definition unknown and appears to have no affect]
  * @return string A converted version of the string represented in ASCII.
  */
@@ -300,7 +308,7 @@ function utf8($string) {
 			if ($value < 128) {
 				$map[] = $value;
 			} else {
-				if (count($values) == 0) {
+				if (empty($values)) {
 					$find = ($value < 224) ? 2 : 3;
 				}
 				$values[] = $value;
@@ -350,7 +358,8 @@ function ascii($array) {
  * @param multi-byte string $haystack The string from which to get the position of the first occurrence of $needle.
  * @param multi-byte string $needle The string to find in $haystack.
  * @param integer $offset The position in $haystack to start searching.
- * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string, or false if $needle is not found.
+ * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string, 
+ *    or false if $needle is not found.
  * @access public
  * @static
  */
@@ -368,8 +377,9 @@ function stripos($haystack, $needle, $offset = 0) {
  * @param string $haystack The string from which to get the first occurrence of $needle.
  * @param string $needle The string to find in $haystack.
  * @param boolean $part Determines which portion of $haystack this function returns.
- *                If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
- *                If set to false, it returns all of $haystack from the first occurrence of $needle to the end, Default value is false.
+ *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end, 
+ *    Default value is false.
  * @return int|boolean The portion of $haystack, or false if $needle is not found.
  * @access public
  * @static
@@ -445,7 +455,7 @@ function strlen($string) {
  * @param string $needle The position counted from the beginning of haystack.
  * @param integer $offset The search offset. If it is not specified, 0 is used.
  * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string.
- *                         If $needle is not found, it returns false.
+ *    If $needle is not found, it returns false.
  * @access public
  * @static
  */
@@ -488,8 +498,9 @@ function strpos($haystack, $needle, $offset = 0) {
  * @param string $haystack The string from which to get the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
  * @param boolean $part Determines which portion of $haystack this function returns.
- *                      If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
- *                      If set to false, it returns all of $haystack from the last occurrence of $needle to the end, Default value is false.
+ *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
+ *    Default value is false.
  * @return string|boolean The portion of $haystack. or false if $needle is not found.
  * @access public
  * @static
@@ -548,8 +559,9 @@ function strrchr($haystack, $needle, $part = false) {
  * @param string $haystack The string from which to get the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
  * @param boolean $part Determines which portion of $haystack this function returns.
- *                      If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
- *                      If set to false, it returns all of $haystack from the last occurrence of $needle to the end, Default value is false.
+ *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end, 
+ *    Default value is false.
  * @return string|boolean The portion of $haystack. or false if $needle is not found.
  * @access public
  * @static
@@ -610,7 +622,8 @@ function strrichr($haystack, $needle, $part = false) {
  * @param string $haystack The string from which to get the position of the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
  * @param integer $offset The position in $haystack to start searching.
- * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string, or false if $needle is not found.
+ * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string, 
+ *    or false if $needle is not found.
  * @access public
  * @static
  */
@@ -661,8 +674,9 @@ function strripos($haystack, $needle, $offset = 0) {
  * @param string $haystack The string being checked, for the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
  * @param integer $offset May be specified to begin searching an arbitrary number of characters into the string.
- *                        Negative values will stop searching at an arbitrary point prior to the end of the string.
- * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string. If $needle is not found, it returns false.
+ *    Negative values will stop searching at an arbitrary point prior to the end of the string.
+ * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string. 
+ *    If $needle is not found, it returns false.
  * @access public
  * @static
  */
@@ -711,8 +725,9 @@ function strrpos($haystack, $needle, $offset = 0) {
  * @param string $haystack The string from which to get the first occurrence of $needle.
  * @param string $needle The string to find in $haystack
  * @param boolean $part Determines which portion of $haystack this function returns.
- *                      If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
- *                      If set to false, it returns all of $haystack from the first occurrence of $needle to the end, Default value is FALSE.
+ *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end, 
+ *    Default value is FALSE.
  * @return string|boolean The portion of $haystack, or true if $needle is not found.
  * @access public
  * @static
@@ -853,14 +868,14 @@ function strtoupper($string) {
 						if ($length > 1 && count($keys[$key]['lower']) > 1) {
 							$j = 0;
 
-							for ($ii = 0; $ii < count($keys[$key]['lower']); $ii++) {
+							for ($ii = 0, $count = count($keys[$key]['lower']); $ii < $count; $ii++) {
 								$nextChar = $utf8Map[$i + $ii];
 
 								if (isset($nextChar) && ($nextChar == $keys[$key]['lower'][$j + $ii])) {
 									$replace++;
 								}
 							}
-							if ($replace == count($keys[$key]['lower'])) {
+							if ($replace == $count) {
 								$upperCase[] = $keys[$key]['upper'];
 								$replaced = array_merge($replaced, array_values($keys[$key]['lower']));
 								$matched = true;
@@ -873,14 +888,14 @@ function strtoupper($string) {
 
 								if (in_array($nextChar, $keys[$ii]['lower'])) {
 
-									for ($jj = 0; $jj < count($keys[$ii]['lower']); $jj++) {
+									for ($jj = 0, $count = count($keys[$ii]['lower']); $jj < $count; $jj++) {
 										$nextChar = $utf8Map[$i + $jj];
 
 										if (isset($nextChar) && ($nextChar == $keys[$ii]['lower'][$j + $jj])) {
 											$replace++;
 										}
 									}
-									if ($replace == count($keys[$ii]['lower'])) {
+									if ($replace == $count) {
 										$upperCase[] = $keys[$ii]['upper'];
 										$replaced = array_merge($replaced, array_values($keys[$ii]['lower']));
 										$matched = true;
diff --git a/cake/libs/sanitize.php b/cake/libs/sanitize.php
index 30d424faf..8ed84a455 100644
--- a/cake/libs/sanitize.php
+++ b/cake/libs/sanitize.php
@@ -161,7 +161,7 @@ function stripTags() {
 		$params = params(func_get_args());
 		$str = $params[0];
 
-		for ($i = 1; $i < count($params); $i++) {
+		for ($i = 1, $count = count($params); $i < $count; $i++) {
 			$str = preg_replace('/<' . $params[$i] . '\b[^>]*>/i', '', $str);
 			$str = preg_replace('/<\/' . $params[$i] . '[^>]*>/i', '', $str);
 		}
diff --git a/cake/libs/set.php b/cake/libs/set.php
index 11382e4dc..4646387b8 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -1077,7 +1077,7 @@ function __flatten($results, $key = null) {
 			if (!is_null($key)) {
 				$id = $key;
 			}
-			if (is_array($r) && count($r)) {
+			if (is_array($r) && !empty($r)) {
 				$stack = array_merge($stack, Set::__flatten($r, $id));
 			} else {
 				$stack[] = array('id' => $id, 'value' => $r);
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index b5be53a74..43b885a34 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -410,7 +410,7 @@ function style($data, $inline = true) {
  * @return string
  */
 	function getCrumbs($separator = '&raquo;', $startText = false) {
-		if (count($this->_crumbs)) {
+		if (!empty($this->_crumbs)) {
 			$out = array();
 			if ($startText) {
 				$out[] = $this->link($startText, '/');
diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index 691cd5dba..34c0e370a 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -566,7 +566,7 @@ function &document() {
  * @access public
  */
 	function hasChildren() {
-		if (is_array($this->children) && count($this->children) > 0) {
+		if (is_array($this->children) && !empty($this->children)) {
 			return true;
 		}
 		return false;
@@ -593,7 +593,7 @@ function toString($options = array(), $depth = 0) {
 			}
 
 			$d .= '<' . $this->name();
-			if (count($this->namespaces) > 0) {
+			if (!empty($this->namespaces) > 0) {
 				foreach ($this->namespaces as $key => $val) {
 					$val = str_replace('"', '\"', $val);
 					$d .= ' xmlns:' . $key . '="' . $val . '"';
@@ -601,14 +601,14 @@ function toString($options = array(), $depth = 0) {
 			}
 
 			$parent =& $this->parent();
-			if ($parent->name === '#document' && count($parent->namespaces) > 0) {
+			if ($parent->name === '#document' && !empty($parent->namespaces)) {
 				foreach ($parent->namespaces as $key => $val) {
 					$val = str_replace('"', '\"', $val);
 					$d .= ' xmlns:' . $key . '="' . $val . '"';
 				}
 			}
 
-			if (is_array($this->attributes) && count($this->attributes) > 0) {
+			if (is_array($this->attributes) && !empty($this->attributes)) {
 				foreach ($this->attributes as $key => $val) {
 					if (is_bool($val) && $val === false) {
 						$val = 0;

From 5d25780b9b1212450838f67fbc197b729be78ad4 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 21 Nov 2009 16:25:39 -0500
Subject: [PATCH 118/244] fixing typo.

---
 app/config/core.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/config/core.php b/app/config/core.php
index cac5eb8ab..672a00e91 100644
--- a/app/config/core.php
+++ b/app/config/core.php
@@ -151,7 +151,7 @@
 	Configure::write('Security.salt', 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi');
 /**
  * Apply timestamps with the last modified time to static assets (js, css, images).
- * Will append a querysting parameter containing the time the file was modified. This is
+ * Will append a querystring parameter containing the time the file was modified. This is
  * useful for invalidating browser caches.
  *
  * Set to `true` to apply timestamps, when debug = 0, or set to 'force' to always enable

From a30aec99fd39978b0532ea6f3e1027f34675af34 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 21 Nov 2009 21:00:15 -0500
Subject: [PATCH 119/244] Applying patch from 'robustsolution' for optimization
 in Dispatcher::dispatch.  Fixes #317

---
 cake/dispatcher.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index f09e10997..70790d7a4 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -136,13 +136,13 @@ function dispatch($url = null, $additionalParams = array()) {
 			)));
 		}
 
-		$privateAction = (bool)(strpos($this->params['action'], '_', 0) === 0);
+		$privateAction = $this->params['action'][0] === '_';
 		$prefixes = Router::prefixes();
 
 		if (!empty($prefixes)) {
 			if (isset($this->params['prefix'])) {
 				$this->params['action'] = $this->params['prefix'] . '_' . $this->params['action'];
-			} elseif (strpos($this->params['action'], '_') !== false && !$privateAction) {
+			} elseif (strpos($this->params['action'], '_') > 0) {
 				list($prefix, $action) = explode('_', $this->params['action']);
 				$privateAction = in_array($prefix, $prefixes);
 			}

From 7e889d849557f97a2f46166cef8c4bfd37b35a9e Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 22 Nov 2009 12:25:53 -0500
Subject: [PATCH 120/244] Changing require_once to require for custom session
 handlers.  If you are using a class to do your custom session handling you
 must include checks to prevent duplicate class errors.  Fixes #324

---
 cake/libs/session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/session.php b/cake/libs/session.php
index 38697ae23..005fe9b30 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -520,7 +520,7 @@ function __initSession() {
 					$config = CONFIGS . Configure::read('Session.save') . '.php';
 
 					if (is_file($config)) {
-						require_once ($config);
+						require($config);
 					}
 				}
 			break;

From c6c747450252c01cc18495c083df16cd1dea353c Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Thu, 19 Nov 2009 22:57:53 -0200
Subject: [PATCH 121/244] Fix test of the size of lines in MagicDb (included
 test for it).

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/magic_db.php                  | 2 +-
 cake/tests/cases/libs/magic_db.test.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cake/libs/magic_db.php b/cake/libs/magic_db.php
index 73b16017c..9d7d90bb2 100644
--- a/cake/libs/magic_db.php
+++ b/cake/libs/magic_db.php
@@ -95,7 +95,7 @@ function toArray($data = null) {
 		$lines = explode("\r\n", $data);
 		$db = array();
 
-		$validHeader = count($lines > 3)
+		$validHeader = count($lines) > 3
 					&& preg_match('/^# Date:([0-9]{4}-[0-9]{2}-[0-9]{2})$/', $lines[1], $date)
 					&& preg_match('/^# Source:(.+)$/', $lines[2], $source)
 					&& strlen($lines[3]) == 0;
diff --git a/cake/tests/cases/libs/magic_db.test.php b/cake/tests/cases/libs/magic_db.test.php
index 3eba7eb46..7ab7b642e 100644
--- a/cake/tests/cases/libs/magic_db.test.php
+++ b/cake/tests/cases/libs/magic_db.test.php
@@ -116,6 +116,9 @@ function testToArray() {
 		$r = $this->Db->toArray(array('yeah'));
 		$this->assertTrue($r === array('yeah'));
 
+		$r = $this->Db->toArray("# FILE_ID DB\r\n# Date:2009-10-10\r\n# Source:xxx.php");
+		$this->assertTrue($r === array());
+
 		$r = $this->Db->toArray('foo');
 		$this->assertTrue($r === array());
 

From b0aec35422733ecdcbca0be8cac6d96cff2989b4 Mon Sep 17 00:00:00 2001
From: robustsolution <info@robustsolution.net>
Date: Thu, 19 Nov 2009 20:22:50 +0000
Subject: [PATCH 122/244] Dispatch::baseUrl() needs optimization a little bit

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/dispatcher.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index 70790d7a4..76db8f292 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -367,9 +367,6 @@ function baseUrl() {
 			$this->webroot = $base .'/';
 			return $base;
 		}
-		$file = null;
-
-		if ($baseUrl) {
 			$file = '/' . basename($baseUrl);
 			$base = dirname($baseUrl);
 
@@ -385,8 +382,6 @@ function baseUrl() {
 				$this->webroot .= $webroot . '/';
 			}
 			return $base . $file;
-		}
-		return false;
 	}
 /**
  * Restructure params in case we're serving a plugin.

From 6c3bcdd7e68d39044e056c44417c926e1a5923dc Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 22 Nov 2009 17:34:11 -0500
Subject: [PATCH 123/244] Removing commented code.

---
 cake/tests/cases/libs/model/models.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index 086eda794..33ca715fa 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -2718,8 +2718,6 @@ class Uuiditem extends CakeTestModel {
  * @var array
  * @access public
  */
-	//var $hasAndBelongsToMany = array('Uuidportfolio' => array('unique' => true));
-//	var $hasAndBelongsToMany = array('Uuidportfolio' => array('with' => 'UuiditemsUuidportfolio'));
 	var $hasAndBelongsToMany = array('Uuidportfolio' => array('with' => 'UuiditemsUuidportfolioNumericid'));
 
 }

From 2e0acbf505fa4053aaf5d333a46dd08d9548b6da Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 22 Nov 2009 17:56:46 -0500
Subject: [PATCH 124/244] Making habtm join conditions used by __saveMulti when
 finding link records to remove.  It should be noted that having conditions on
 non-joinTable tables, and not having a model on the joinTable can cause SQL
 issues.  Fixes #304

---
 cake/libs/model/model.php                     | 18 ++++---
 .../cases/libs/model/model_write.test.php     | 50 ++++++++++++++++++-
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index e688f1ea9..d559af5a3 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1302,14 +1302,6 @@ function __saveMulti($joined, $id) {
 			if (isset($this->hasAndBelongsToMany[$assoc])) {
 				list($join) = $this->joinModel($this->hasAndBelongsToMany[$assoc]['with']);
 
-				$conditions = array($join . '.' . $this->hasAndBelongsToMany[$assoc]['foreignKey'] => $id);
-
-				$links = $this->{$join}->find('all', array(
-					'conditions' => $conditions,
-					'recursive' => -1,
-					'fields' => $this->hasAndBelongsToMany[$assoc]['associationForeignKey']
-				));
-
 				$isUUID = !empty($this->{$join}->primaryKey) && (
 						$this->{$join}->_schema[$this->{$join}->primaryKey]['length'] == 36 && (
 						$this->{$join}->_schema[$this->{$join}->primaryKey]['type'] === 'string' ||
@@ -1351,6 +1343,16 @@ function __saveMulti($joined, $id) {
 				}
 
 				if ($this->hasAndBelongsToMany[$assoc]['unique']) {
+					$conditions = array_merge(
+						array($join . '.' . $this->hasAndBelongsToMany[$assoc]['foreignKey'] => $id),
+						(array)$this->hasAndBelongsToMany[$assoc]['conditions']
+					);
+					$links = $this->{$join}->find('all', array(
+						'conditions' => $conditions,
+						'recursive' => empty($this->hasAndBelongsToMany[$assoc]['conditions']) ? -1 : 0,
+						'fields' => $this->hasAndBelongsToMany[$assoc]['associationForeignKey']
+					));
+
 					$associationForeignKey = "{$join}." . $this->hasAndBelongsToMany[$assoc]['associationForeignKey'];
 					$oldLinks = Set::extract($links, "{n}.{$associationForeignKey}");
 					if (!empty($oldLinks)) {
diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
index 4d969cca9..2931b4be2 100644
--- a/cake/tests/cases/libs/model/model_write.test.php
+++ b/cake/tests/cases/libs/model/model_write.test.php
@@ -609,7 +609,7 @@ function testValidatesBackwards() {
 	function testBeforeValidateSaveAbortion() {
 		$Model =& new CallbackPostTestModel();
 		$Model->beforeValidateReturn = false;
-		
+
 		$data = array(
 			'title' => 'new article',
 			'body' => 'this is some text.'
@@ -1992,6 +1992,54 @@ function testSaveHabtmCustomKeys() {
 		));
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * test that saving habtm records respects conditions set in the the 'conditions' key
+ * for the association.
+ *
+ * @return void
+ */
+	function testHabtmSaveWithConditionsInAssociation() {
+		$this->loadFixtures('JoinThing', 'Something', 'SomethingElse');
+		$Something =& new Something();
+		$Something->unbindModel(array('hasAndBelongsToMany' => array('SomethingElse')), false);
+
+		$Something->bindModel(array(
+			'hasAndBelongsToMany' => array(
+				'DoomedSomethingElse' => array(
+					'className' => 'SomethingElse',
+					'joinTable' => 'join_things',
+					'conditions' => 'JoinThing.doomed = 1',
+					'unique' => true
+				),
+				'NotDoomedSomethingElse' => array(
+					'className' => 'SomethingElse',
+					'joinTable' => 'join_things',
+					'conditions' => array('JoinThing.doomed' => 0),
+					'unique' => true
+				)
+			)
+		), false);
+		$result = $Something->read(null, 1);
+		$this->assertTrue(empty($result['NotDoomedSomethingElse']));
+		$this->assertEqual(count($result['DoomedSomethingElse']), 1);
+
+		$data = array(
+			'Something' => array('id' => 1),
+			'NotDoomedSomethingElse' => array(
+				'NotDoomedSomethingElse' => array(
+					array('something_else_id' => 2, 'doomed' => 0),
+					array('something_else_id' => 3, 'doomed' => 0)
+				)
+			)
+		);
+		$Something->create($data);
+		$result = $Something->save();
+		$this->assertTrue($result);
+
+		$result = $Something->read(null, 1);
+		$this->assertEqual(count($result['NotDoomedSomethingElse']), 2);
+		$this->assertEqual(count($result['DoomedSomethingElse']), 1);
+	}
 /**
  * testHabtmSaveKeyResolution method
  *

From 5aba1436202baf820316432823609e823da6cbbf Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 23 Nov 2009 12:52:38 -0500
Subject: [PATCH 125/244] Applying optimization to Controller::postConditions
 from 'robustsolution' Fixes #287

---
 cake/libs/controller/controller.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index d391c2472..f47a5eec5 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -895,11 +895,12 @@ function postConditions($data = array(), $op = null, $bool = 'AND', $exclusive =
 			$op = '';
 		}
 
+		$arrayOp = is_array($op);
 		foreach ($data as $model => $fields) {
 			foreach ($fields as $field => $value) {
 				$key = $model.'.'.$field;
 				$fieldOp = $op;
-				if (is_array($op)) {
+				if ($arrayOp) {
 					if (array_key_exists($key, $op)) {
 						$fieldOp = $op[$key];
 					} elseif (array_key_exists($field, $op)) {

From 72c0e2ca5a22932ecfdc855e4176e24c50a284eb Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 24 Nov 2009 09:27:13 -0500
Subject: [PATCH 126/244] Applying minor optimization from 'robustsolution' to
 Router::connectNamed(). Fixes #312

---
 cake/libs/router.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cake/libs/router.php b/cake/libs/router.php
index 083787c69..d1d95ca08 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -252,8 +252,9 @@ function connectNamed($named, $options = array()) {
 		if ($named === true || $named === false) {
 			$options = array_merge(array('default' => $named, 'reset' => true, 'greedy' => $named), $options);
 			$named = array();
+		} else {
+			$options = array_merge(array('default' => false, 'reset' => false, 'greedy' => true), $options);
 		}
-		$options = array_merge(array('default' => false, 'reset' => false, 'greedy' => true), $options);
 
 		if ($options['reset'] == true || $_this->named['rules'] === false) {
 			$_this->named['rules'] = array();

From 58446e0785e6a5193d3773738289f851343702e9 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 24 Nov 2009 11:57:56 -0500
Subject: [PATCH 127/244] Adding documentation note about $options['q'] Refs
 #357

---
 cake/libs/view/helpers/javascript.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index ec68f6580..29ee2281a 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -582,7 +582,7 @@ function includeScript($script = "", $options = array()) {
  * - postfix - Appends the string to the returned data. Default is ''
  * - stringKeys - A list of array keys to be treated as a string.
  * - quoteKeys - If false treats $stringKeys as a list of keys **not** to be quoted. Default is true.
- * - q - The type of quote to use. Default is "'"
+ * - q - The type of quote to use. Default is '"'.  This option only affects the keys, not the values.
  *
  * @param array $data Data to be converted
  * @param array $options Set of options: block, prefix, postfix, stringKeys, quoteKeys, q

From d758dbc3430e8ad5e6b6df18e322c2e888fe19d5 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 24 Nov 2009 19:57:20 -0500
Subject: [PATCH 128/244] Updating cake.generic.css to let .altrow class to
 apply to dd and dt elements.  Fixes #361

---
 app/webroot/css/cake.generic.css                              | 2 +-
 cake/console/libs/templates/skel/webroot/css/cake.generic.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/webroot/css/cake.generic.css b/app/webroot/css/cake.generic.css
index 676cf4b35..ab3e1321c 100644
--- a/app/webroot/css/cake.generic.css
+++ b/app/webroot/css/cake.generic.css
@@ -194,7 +194,7 @@ dl {
 	margin: 0em 0em;
 	width: 60%;
 }
-dl.altrow {
+dl .altrow {
 	background: #f4f4f4;
 }
 dt {
diff --git a/cake/console/libs/templates/skel/webroot/css/cake.generic.css b/cake/console/libs/templates/skel/webroot/css/cake.generic.css
index 5042adfbb..4ba03cedd 100644
--- a/cake/console/libs/templates/skel/webroot/css/cake.generic.css
+++ b/cake/console/libs/templates/skel/webroot/css/cake.generic.css
@@ -195,7 +195,7 @@ dl {
 	margin: 0em 0em;
 	width: 60%;
 }
-dl.altrow {
+dl .altrow {
 	background: #f4f4f4;
 }
 dt {

From 51d0805ce0e8795690c4796d9ef1a3783015b62d Mon Sep 17 00:00:00 2001
From: dogmatic <dogmatic69@gmail.com>
Date: Tue, 24 Nov 2009 21:11:22 +0200
Subject: [PATCH 129/244] fixes Text::toList to allow passing array( 1=>"abc",
 2=>"abc" ) and the updated test case

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/view/helpers/text.php                  | 15 ++++++++-------
 cake/tests/cases/libs/view/helpers/text.test.php |  3 +++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php
index a3ae2bee4..fb687a1bb 100644
--- a/cake/libs/view/helpers/text.php
+++ b/cake/libs/view/helpers/text.php
@@ -309,16 +309,17 @@ function excerpt($text, $phrase, $radius = 100, $ending = "...") {
  * @access public
  */
 	function toList($list, $and = 'and') {
-		$r = '';
-		$c = count($list) - 1;
+		$return = '';
+		$count = count($list) - 1;
+	    $counter = 0;
 		foreach ($list as $i => $item) {
-			$r .= $item;
-			if ($c > 0 && $i < $c)
-			{
-				$r .= ($i < $c - 1 ? ', ' : " {$and} ");
+			$return .= $item;
+			if ($count > 0 && $counter < $count) {
+				$return .= ($counter < $count - 1 ? ', ' : " {$and} ");
 			}
+		    $counter++;
 		}
-		return $r;
+		return $return;
 	}
 /**
  * Text-to-html parser, similar to Textile or RedCloth, only with a little different syntax.
diff --git a/cake/tests/cases/libs/view/helpers/text.test.php b/cake/tests/cases/libs/view/helpers/text.test.php
index 88a26a61b..bd2b08526 100644
--- a/cake/tests/cases/libs/view/helpers/text.test.php
+++ b/cake/tests/cases/libs/view/helpers/text.test.php
@@ -343,6 +343,9 @@ function testListGeneration() {
 
 		$result = $this->Text->toList(array('Dusty', 'Lucky', 'Ned'), 'y');
 		$this->assertEqual($result, 'Dusty, Lucky y Ned');
+
+		$result = $this->Text->toList(array( 1 => 'Dusty', 2 => 'Lucky', 3 => 'Ned'), 'y');
+		$this->assertEqual($result, 'Dusty, Lucky y Ned');
 	}
 }
 ?>
\ No newline at end of file

From 64dffb76632d316a50e178c4be69d48f5f3abf00 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 24 Nov 2009 22:49:40 -0500
Subject: [PATCH 130/244] Moving shared method from DboMysqli and DboMysql up
 to DboMysqlBase. Fixes #358

---
 cake/libs/model/datasources/dbo/dbo_mysql.php | 94 +++++++++----------
 .../libs/model/datasources/dbo/dbo_mysqli.php | 47 ----------
 2 files changed, 47 insertions(+), 94 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index 395d2a78f..64d047504 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -363,6 +363,53 @@ function insertMulti($table, $fields, $values) {
 		$values = implode(', ', $values);
 		$this->query("INSERT INTO {$table} ({$fields}) VALUES {$values}");
 	}
+/**
+ * Converts database-layer column types to basic types
+ *
+ * @param string $real Real database-layer column type (i.e. "varchar(255)")
+ * @return string Abstract column type (i.e. "string")
+ */
+	function column($real) {
+		if (is_array($real)) {
+			$col = $real['name'];
+			if (isset($real['limit'])) {
+				$col .= '('.$real['limit'].')';
+			}
+			return $col;
+		}
+
+		$col = str_replace(')', '', $real);
+		$limit = $this->length($real);
+		if (strpos($col, '(') !== false) {
+			list($col, $vals) = explode('(', $col);
+		}
+
+		if (in_array($col, array('date', 'time', 'datetime', 'timestamp'))) {
+			return $col;
+		}
+		if (($col == 'tinyint' && $limit == 1) || $col == 'boolean') {
+			return 'boolean';
+		}
+		if (strpos($col, 'int') !== false) {
+			return 'integer';
+		}
+		if (strpos($col, 'char') !== false || $col == 'tinytext') {
+			return 'string';
+		}
+		if (strpos($col, 'text') !== false) {
+			return 'text';
+		}
+		if (strpos($col, 'blob') !== false || $col == 'binary') {
+			return 'binary';
+		}
+		if (strpos($col, 'float') !== false || strpos($col, 'double') !== false || strpos($col, 'decimal') !== false) {
+			return 'float';
+		}
+		if (strpos($col, 'enum') !== false) {
+			return "enum($vals)";
+		}
+		return 'text';
+	}
 }
 
 /**
@@ -569,53 +616,6 @@ function lastInsertId($source = null) {
 
 		return null;
 	}
-/**
- * Converts database-layer column types to basic types
- *
- * @param string $real Real database-layer column type (i.e. "varchar(255)")
- * @return string Abstract column type (i.e. "string")
- */
-	function column($real) {
-		if (is_array($real)) {
-			$col = $real['name'];
-			if (isset($real['limit'])) {
-				$col .= '('.$real['limit'].')';
-			}
-			return $col;
-		}
-
-		$col = str_replace(')', '', $real);
-		$limit = $this->length($real);
-		if (strpos($col, '(') !== false) {
-			list($col, $vals) = explode('(', $col);
-		}
-
-		if (in_array($col, array('date', 'time', 'datetime', 'timestamp'))) {
-			return $col;
-		}
-		if (($col == 'tinyint' && $limit == 1) || $col == 'boolean') {
-			return 'boolean';
-		}
-		if (strpos($col, 'int') !== false) {
-			return 'integer';
-		}
-		if (strpos($col, 'char') !== false || $col == 'tinytext') {
-			return 'string';
-		}
-		if (strpos($col, 'text') !== false) {
-			return 'text';
-		}
-		if (strpos($col, 'blob') !== false || $col == 'binary') {
-			return 'binary';
-		}
-		if (strpos($col, 'float') !== false || strpos($col, 'double') !== false || strpos($col, 'decimal') !== false) {
-			return 'float';
-		}
-		if (strpos($col, 'enum') !== false) {
-			return "enum($vals)";
-		}
-		return 'text';
-	}
 /**
  * Enter description here...
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index 2742a7c31..cb78e110d 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -251,53 +251,6 @@ function lastInsertId($source = null) {
 		}
 		return null;
 	}
-/**
- * Converts database-layer column types to basic types
- *
- * @param string $real Real database-layer column type (i.e. "varchar(255)")
- * @return string Abstract column type (i.e. "string")
- */
-	function column($real) {
-		if (is_array($real)) {
-			$col = $real['name'];
-			if (isset($real['limit'])) {
-				$col .= '('.$real['limit'].')';
-			}
-			return $col;
-		}
-
-		$col = str_replace(')', '', $real);
-		$limit = $this->length($real);
-		if (strpos($col, '(') !== false) {
-			list($col, $vals) = explode('(', $col);
-		}
-
-		if (in_array($col, array('date', 'time', 'datetime', 'timestamp'))) {
-			return $col;
-		}
-		if (($col == 'tinyint' && $limit == 1) || $col == 'boolean') {
-			return 'boolean';
-		}
-		if (strpos($col, 'int') !== false) {
-			return 'integer';
-		}
-		if (strpos($col, 'char') !== false || $col == 'tinytext') {
-			return 'string';
-		}
-		if (strpos($col, 'text') !== false) {
-			return 'text';
-		}
-		if (strpos($col, 'blob') !== false || $col == 'binary') {
-			return 'binary';
-		}
-		if (strpos($col, 'float') !== false || strpos($col, 'double') !== false || strpos($col, 'decimal') !== false) {
-			return 'float';
-		}
-		if (strpos($col, 'enum') !== false) {
-			return "enum($vals)";
-		}
-		return 'text';
-	}
 /**
  * Enter description here...
  *

From ad20e43730dd99e5edc3028d6904b3ffb8ce80b6 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Wed, 11 Nov 2009 01:19:19 +0530
Subject: [PATCH 131/244] Removing unneeded code for minor optimization

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/model/behaviors/tree.php | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php
index 145d298e1..fd4a89993 100644
--- a/cake/libs/model/behaviors/tree.php
+++ b/cake/libs/model/behaviors/tree.php
@@ -28,7 +28,7 @@
  * Tree Behavior.
  *
  * Enables a model object to act as a node-based tree. Using Modified Preorder Tree Traversal
- * 
+ *
  * @see http://en.wikipedia.org/wiki/Tree_traversal
  * @package       cake
  * @subpackage    cake.cake.libs.model.behaviors
@@ -138,15 +138,6 @@ function beforeDelete(&$Model) {
 	function beforeSave(&$Model) {
 		extract($this->settings[$Model->alias]);
 
-		if (isset($Model->data[$Model->alias][$Model->primaryKey])) {
-			if ($Model->data[$Model->alias][$Model->primaryKey]) {
-				if (!$Model->id) {
-					$Model->id = $Model->data[$Model->alias][$Model->primaryKey];
-				}
-			}
-			unset($Model->data[$Model->alias][$Model->primaryKey]);
-		}
-
 		$this->_addToWhitelist($Model, array($left, $right));
 		if (!$Model->id) {
 			if (array_key_exists($parent, $Model->data[$Model->alias]) && $Model->data[$Model->alias][$parent]) {
@@ -616,9 +607,9 @@ function recover(&$Model, $mode = 'parent', $missingParentAction = null) {
  * This method does not change the parent of any node.
  *
  * Requires a valid tree, by default it verifies the tree before beginning.
- * 
+ *
  * Options:
- * 
+ *
  * - 'id' id of record to use as top node for reordering
  * - 'field' Which field to use in reordeing defaults to displayField
  * - 'order' Direction to order either DESC or ASC (defaults to ASC)

From 26aa3731e033e9a3c22e0d558f77d75ebfc1e23c Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 27 Nov 2009 14:27:32 -0500
Subject: [PATCH 132/244] Fixing _name_ elements being inserted into serialized
 xml from Xml lib.  Test case added. Fixes #367

---
 cake/libs/xml.php                  |  2 +-
 cake/tests/cases/libs/xml.test.php | 29 +++++++++++++++++++++++------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index 34c0e370a..475caaf19 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -241,7 +241,7 @@ function normalize($object, $keyName = null, $options = array()) {
 		}
 
 		$n = $name;
-		if (!empty($chldObjs['_name_'])) {
+		if (isset($chldObjs['_name_'])) {
 			$n = null;
 			unset($chldObjs['_name_']);
 		}
diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php
index 82c5b5c17..e880cc6e2 100644
--- a/cake/tests/cases/libs/xml.test.php
+++ b/cake/tests/cases/libs/xml.test.php
@@ -114,7 +114,6 @@ function testSerializeOnMultiDimensionalArray() {
 		$result =& new Xml($data, array('format' => 'tags'));
 		$expected = '<statuses><status><id>1</id></status><status><id>2</id></status></statuses>';
 		$this->assertIdentical($result->toString(), $expected);
-
 	}
 
 /**
@@ -258,7 +257,7 @@ function testArraySingleSerialization() {
  * @access public
  * @return void
  */
-	function testArraySerialization() {
+	function testSerializationArray() {
 		$input = array(
 			array(
 				'Project' => array('id' => 1, 'title' => null, 'client_id' => 1, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 1, 'industry_id' => 1, 'modified' => null, 'created' => null),
@@ -285,7 +284,7 @@ function testArraySerialization() {
  * @access public
  * @return void
  */
-	function testNestedArraySerialization() {
+	function testSerializationNestedArray() {
 		$input = array(
 			array(
 				'Project' => array('id' => 1, 'title' => null, 'client_id' => 1, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 1, 'industry_id' => 1, 'modified' => null, 'created' => null),
@@ -330,9 +329,9 @@ function testNestedArraySerialization() {
  */
 	function testArraySerializationWithRoot() {
 		$input = array(
-					array('Shirt' => array('id' => 1, 'color' => 'green')),
-					array('Shirt' => array('id' => 2, 'color' => 'blue')),
-					);
+			array('Shirt' => array('id' => 1, 'color' => 'green')),
+			array('Shirt' => array('id' => 2, 'color' => 'blue')),
+		);
 		$expected = '<collection><shirt id="1" color="green" />';
 		$expected .= '<shirt id="2" color="blue" /></collection>';
 
@@ -699,6 +698,24 @@ function testSetSerialization() {
 		$result = $xml->toString(array('header' => false, 'cdata' => false));
 		$this->assertEqual($expected, $result);
 	}
+/**
+ * ensure that normalize does not add _name_ elements that come from Set::map sometimes.
+ *
+ * @return void
+ */
+	function testNormalizeNotAdding_name_Element() {
+		$input = array(
+			'output' => array(
+				'Vouchers' => array(
+					array('Voucher' => array('id' => 1)),
+					array('Voucher' => array('id' => 2)),
+				),
+			)
+		);
+		$xml = new Xml($input, array('attributes' => false, 'format' => 'tags'));
+		$this->assertFalse(isset($xml->children[0]->children[0]->children[1]), 'Too many children %s');
+		$this->assertEqual($xml->children[0]->children[0]->children[0]->name, 'voucher');
+	}
 /**
  * testSimpleParsing method
  *

From fccfe14e8d01d9affa5ab09682f1dda6c6ea4dec Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 30 Nov 2009 09:18:24 -0500
Subject: [PATCH 133/244] Expanding doc block for ClassRegistry.

---
 cake/libs/class_registry.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/class_registry.php b/cake/libs/class_registry.php
index 5ff5ec320..2f566b46c 100644
--- a/cake/libs/class_registry.php
+++ b/cake/libs/class_registry.php
@@ -235,7 +235,7 @@ function keys() {
  * Return object which corresponds to given key.
  *
  * @param string $key Key of object to look for
- * @return mixed Object stored in registry
+ * @return mixed Object stored in registry or boolean false if the object does not exist.
  * @access public
  * @static
  */

From cd46f4db2e920767e993e074d568baa43dc0f279 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Mon, 30 Nov 2009 09:19:25 -0500
Subject: [PATCH 134/244] Fixing function signature of ThemeView constructor. 
 Fixes issues where ThemeView would always be registered causing issues with
 EmailComponent and themed views. Fixes #370

---
 cake/libs/view/theme.php                  |  4 ++--
 cake/tests/cases/libs/view/theme.test.php | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/cake/libs/view/theme.php b/cake/libs/view/theme.php
index 97e2569a5..4167c810f 100644
--- a/cake/libs/view/theme.php
+++ b/cake/libs/view/theme.php
@@ -52,8 +52,8 @@ class ThemeView extends View {
  *
  * @param unknown_type $controller
  */
-	function __construct (&$controller) {
-		parent::__construct($controller);
+	function __construct (&$controller, $register = true) {
+		parent::__construct($controller, $register);
 		$this->theme =& $controller->theme;
 
 		if (!empty($this->theme)) {
diff --git a/cake/tests/cases/libs/view/theme.test.php b/cake/tests/cases/libs/view/theme.test.php
index eeb5dd883..6f68cbf1f 100644
--- a/cake/tests/cases/libs/view/theme.test.php
+++ b/cake/tests/cases/libs/view/theme.test.php
@@ -142,11 +142,11 @@ class ThemeViewTest extends CakeTestCase {
  */
 	function setUp() {
 		Router::reload();
-		$this->Controller = new Controller();
-		$this->PostsController = new ThemePostsController();
+		$this->Controller =& new Controller();
+		$this->PostsController =& new ThemePostsController();
 		$this->PostsController->viewPath = 'posts';
 		$this->PostsController->index();
-		$this->ThemeView = new ThemeView($this->PostsController);
+		$this->ThemeView =& new ThemeView($this->PostsController);
 	}
 /**
  * tearDown method
@@ -158,6 +158,19 @@ function tearDown() {
 		unset($this->ThemeView);
 		unset($this->PostsController);
 		unset($this->Controller);
+		ClassRegistry::flush();
+	}
+/**
+ * test that the theme view can be constructed without going into the registry
+ *
+ * @return void
+ */
+	function testConstructionNoRegister() {
+		ClassRegistry::flush();
+		$controller = null;
+		$Theme =& new ThemeView($controller, false);
+		$ThemeTwo =& ClassRegistry::getObject('view');
+		$this->assertFalse($ThemeTwo);
 	}
 /**
  * testPluginGetTemplate method

From 60465287445f546ea85ee12827772c06055984f7 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 1 Dec 2009 10:01:36 -0500
Subject: [PATCH 135/244] Moving XmlNode::__killParent() to a protected method
 so Xml can access it.  Adding _killParent(true) call to Xml::__destruct. 
 Forces destruction of circular references held in child objects when an xml
 object is garbage collected.  Fixes #369

---
 cake/libs/xml.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index 475caaf19..574bfe2bb 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -110,7 +110,6 @@ function __construct($name = null, $value = null, $namespace = null) {
 			$this->createTextNode($value);
 		}
 	}
-
 /**
  * Adds a namespace to the current node
  *
@@ -732,13 +731,13 @@ function __toString() {
  * if given the $recursive parameter.
  *
  * @param boolean $recursive Recursively delete elements.
- * @access private
+ * @access protected
  */
-	function __killParent($recursive = true) {
+	function _killParent($recursive = true) {
 		unset($this->__parent, $this->_log);
 		if ($recursive && $this->hasChildren()) {
 			for ($i = 0; $i < count($this->children); $i++) {
-				$this->children[$i]->__killParent(true);
+				$this->children[$i]->_killParent(true);
 			}
 		}
 	}
@@ -1093,6 +1092,7 @@ function __destruct() {
 		if (is_resource($this->__parser)) {
 			xml_parser_free($this->__parser);
 		}
+		$this->_killParent(true);
 	}
 /**
  * Adds a namespace to any XML documents generated or parsed

From be64f26f9f73ae32a7e6798a158fe126af6e07d1 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 3 Dec 2009 00:53:31 -0500
Subject: [PATCH 136/244] Updating doc blocks for model::validates.

---
 cake/libs/model/model.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index d559af5a3..706c4b5eb 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -2333,6 +2333,8 @@ function query() {
 /**
  * Returns true if all fields pass validation.
  *
+ * Will validate the currently set data.  Use Model::set() or Model::create() to set the active data.
+ *
  * @param string $options An optional array of custom options to be made available in the beforeValidate callback
  * @return boolean True if there are no errors
  * @access public
@@ -2350,6 +2352,7 @@ function validates($options = array()) {
  *
  * @param string $options An optional array of custom options to be made available in the beforeValidate callback
  * @return array Array of invalid fields
+ * @see Model::validates()
  * @access public
  * @link http://book.cakephp.org/view/410/Validating-Data-from-the-Controller
  */

From cc750d15f1b41976b496d23d41a836c2becb6154 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 4 Dec 2009 14:39:12 -0500
Subject: [PATCH 137/244] Adding test to disprove #385.  Proves saveAll with
 validate => first behaves correctly.

---
 cake/tests/cases/libs/model/model_write.test.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
index 2931b4be2..31388b2d6 100644
--- a/cake/tests/cases/libs/model/model_write.test.php
+++ b/cake/tests/cases/libs/model/model_write.test.php
@@ -3067,6 +3067,19 @@ function testSaveAllHasOne() {
 				'attachment' => 'some_file.zip'
 		)));
 		$this->assertEqual($result, $expected);
+
+
+		$model->Attachment->bindModel(array('belongsTo' => array('Comment')), false);
+		$data = array(
+			'Comment' => array(
+				'comment' => 'Comment with attachment',
+				'article_id' => 1,
+				'user_id' => 1
+			),
+			'Attachment' => array(
+				'attachment' => 'some_file.zip'
+		));
+		$this->assertTrue($model->saveAll($data, array('validate' => 'first')));
 	}
 /**
  * testSaveAllBelongsTo method

From 7c2cdb1fb4ef05625ba742cabd1e8cb8e3269724 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Tue, 8 Dec 2009 22:00:55 -0500
Subject: [PATCH 138/244] Adding tests to Xml::toString to disprove #395

---
 cake/tests/cases/libs/xml.test.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php
index e880cc6e2..e92133ba0 100644
--- a/cake/tests/cases/libs/xml.test.php
+++ b/cake/tests/cases/libs/xml.test.php
@@ -187,6 +187,22 @@ function testSimpleArrayWithZeroValues() {
 		$result = $xml->toString(false);
 		$expected = '<zero_string>0</zero_string><zero_integer>0</zero_integer>';
 		$this->assertEqual($expected, $result);
+
+		$data = array(
+			'Client' => array(
+				'id' => 3,
+				'object_id' => 9,
+				'key' => 'alt',
+				'name' => 'Client Two',
+				'created_by' => 4,
+				'status' => '0',
+				'num_projects' => 0
+			)
+		);
+		$xml = new Xml($data, array('format' => 'tags'));
+		$result = $xml->toString(array('format' => 'tags', 'header' => false));
+		$this->assertPattern('/<status>0<\/status>/', $result);
+		$this->assertPattern('/<num_projects>0<\/num_projects>/', $result);
 	}
 /**
  * testHeader method

From c3bf6bc0e82c0e59115ad5b21e313fedb5d6d46d Mon Sep 17 00:00:00 2001
From: "renan.saddam" <renan.saddam@gmail.com>
Date: Wed, 9 Dec 2009 21:10:37 -0200
Subject: [PATCH 139/244] Checking for french error on dbo_mssql. Fixes #77.

---
 cake/libs/model/datasources/dbo/dbo_mssql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index 09e9d1ab7..df0eaa66c 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -415,7 +415,7 @@ function lastError() {
 		$error = mssql_get_last_message();
 
 		if ($error) {
-			if (!preg_match('/contexto de la base de datos a|contesto di database|changed database|datenbankkontext/i', $error)) {
+			if (!preg_match('/contexto de la base de datos a|contesto di database|changed database|contexte de la base de don|datenbankkontext/i', $error)) {
 				return $error;
 			}
 		}

From 47a9401d4343c36c5518f104177066dceaf9ce27 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sun, 13 Dec 2009 12:39:39 -0500
Subject: [PATCH 140/244] Adding test case for cached view files, and fatal
 errors caused by the view instance not being registered. View instances are
 now registered when rendering view caches, and unregistered if the cached
 view fails. This fixes issues rendering flash messages with custom layouts
 and fixes FormHelper methods inside nocache blocks. Fixes #60

---
 cake/dispatcher.php                           |  8 ++-
 cake/tests/cases/dispatcher.test.php          | 51 +++++++++++++++++++
 .../tests/test_app/views/posts/cache_form.ctp | 14 +++++
 3 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 cake/tests/test_app/views/posts/cache_form.ctp

diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index 76db8f292..69e6a3f31 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -678,8 +678,12 @@ function cached($url) {
 					App::import('Core', 'View');
 				}
 				$controller = null;
-				$view =& new View($controller, false);
-				return $view->renderCache($filename, getMicrotime());
+				$view =& new View($controller);
+				$return = $view->renderCache($filename, getMicrotime());
+				if (!$return) {
+					ClassRegistry::removeObject('view');
+				}
+				return $return;
 			}
 		}
 		return false;
diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php
index 4ea07969b..bc6515f01 100644
--- a/cake/tests/cases/dispatcher.test.php
+++ b/cake/tests/cases/dispatcher.test.php
@@ -448,6 +448,15 @@ function test_nocache_tags() {
 	function view($id = null) {
 		$this->render('index');
 	}
+/**
+ * test cached forms / tests view object being registered
+ *
+ * @return void
+ */
+	function cache_form() {
+		$this->cacheAction = 10;
+		$this->helpers[] = 'Form';
+	}
 }
 /**
  * TimesheetsController class
@@ -1899,6 +1908,48 @@ function testFullPageCachingDispatch() {
 		$filename = $this->__cachePath($dispatcher->here);
 		$this->assertTrue(file_exists($filename));
 		unlink($filename);
+
+		$url = 'TestCachedPages/test_nocache_tags';
+	}
+/**
+ * test that cached() registers a view and un-registers it.  Tests
+ * that helpers using ClassRegistry::getObject('view'); don't fail
+ *
+ * @return void
+ */
+	function testCachedRegisteringViewObject() {
+		Configure::write('Cache.disable', false);
+		Configure::write('Cache.check', true);
+		Configure::write('debug', 2);
+
+		$_POST = array();
+		$_SERVER['PHP_SELF'] = '/';
+
+		Router::reload();
+		Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS));
+
+		$dispatcher =& new Dispatcher();
+		$dispatcher->base = false;
+
+		$url = 'test_cached_pages/cache_form';
+		ob_start();
+		$dispatcher->dispatch($url);
+		$out = ob_get_clean();
+
+		ClassRegistry::flush();
+
+		ob_start();
+		$dispatcher->cached($url);
+		$cached = ob_get_clean();
+
+		$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
+		$cached = preg_replace('/<!--+[^<>]+-->/', '', $cached);
+		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $cached);
+
+		$this->assertEqual($result, $expected);
+		$filename = $this->__cachePath($dispatcher->here);
+		unlink($filename);
+		ClassRegistry::flush();
 	}
 /**
  * testHttpMethodOverrides method
diff --git a/cake/tests/test_app/views/posts/cache_form.ctp b/cake/tests/test_app/views/posts/cache_form.ctp
new file mode 100644
index 000000000..87ec9cf5b
--- /dev/null
+++ b/cake/tests/test_app/views/posts/cache_form.ctp
@@ -0,0 +1,14 @@
+<div class="users form">
+<cake:nocache>
+	<?php echo $form->create('User');?>
+		<fieldset>
+	 		<legend><?php __('Add User');?></legend>
+		<?php
+			echo $form->input('username');
+			echo $form->input('email');
+			echo $form->input('password');
+		?>
+		</fieldset>
+	<?php echo $form->end('Submit');?>
+</cake:nocache>
+</div>
\ No newline at end of file

From 02330b2d9c292110240c606e976e182c973897e9 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sun, 13 Dec 2009 15:52:07 -0500
Subject: [PATCH 141/244] Making DboSource::fields() accept an expression
 object.  Fixes issues with sql parsing over quoting special SQL syntax. Tests
 added Fixes #66

---
 cake/libs/model/datasources/dbo_source.php         |  4 +++-
 .../libs/model/datasources/dbo_source.test.php     | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index ae8df2cbe..444f0244a 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -1683,7 +1683,9 @@ function fields(&$model, $alias = null, $fields = array(), $quote = true) {
 
 		if ($count >= 1 && !in_array($fields[0], array('*', 'COUNT(*)'))) {
 			for ($i = 0; $i < $count; $i++) {
-				if (preg_match('/^\(.*\)\s' . $this->alias . '.*/i', $fields[$i])){
+				if (is_object($fields[$i]) && isset($fields[$i]->type) && $fields[$i]->type === 'expression') {
+					$fields[$i] = $fields[$i]->value;
+				} elseif (preg_match('/^\(.*\)\s' . $this->alias . '.*/i', $fields[$i])){
 					continue;
 				} elseif (!preg_match('/^.+\\(.*\\)/', $fields[$i])) {
 					$prepend = '';
diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
index 00fe40866..3dbe92991 100644
--- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -2781,6 +2781,20 @@ function testFieldParsing() {
 		);
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * test that fields() will accept objects made from DboSource::expression
+ *
+ * @return void
+ */
+	function testFieldsWithExpression() {
+		$expression =& $this->testDb->expression("CASE Sample.id WHEN 1 THEN 'Id One' ELSE 'Other Id' END AS case_col");
+		$result = $this->testDb->fields($this->Model, null, array("id", $expression));
+		$expected = array(
+			'`TestModel`.`id`',
+			"CASE Sample.id WHEN 1 THEN 'Id One' ELSE 'Other Id' END AS case_col"
+		);
+		$this->assertEqual($result, $expected);
+	}
 /**
  * testMergeAssociations method
  *

From 33038c75ac76ec5c8fcc543a4013646b4bf484f2 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Tue, 15 Dec 2009 20:41:44 +0530
Subject: [PATCH 142/244] Removing redundant 'isset' check from
 DboMysql::connect

---
 cake/libs/model/datasources/dbo/dbo_mysql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index 64d047504..89c42923e 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -461,7 +461,7 @@ function connect() {
 			$this->connected = true;
 		}
 
-		if (isset($config['encoding']) && !empty($config['encoding'])) {
+		if (!empty($config['encoding'])) {
 			$this->setEncoding($config['encoding']);
 		}
 

From a490e249fa76b1076ab5ee255636f1f533560842 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Mon, 14 Dec 2009 23:21:26 -0500
Subject: [PATCH 143/244] Adding test for validation of with models canceling a
 save.

Adding initial implementation of Model::__validateWithModel().

Correcting error in previous commit.  Adding tests for saveAll and validating habtm with models.
---
 cake/libs/model/model.php                     | 42 ++++++++-
 .../libs/model/model_validation.test.php      | 94 +++++++++++++++++++
 2 files changed, 134 insertions(+), 2 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 706c4b5eb..7e771a075 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -2331,7 +2331,8 @@ function query() {
 		return call_user_func_array(array(&$db, 'query'), $params);
 	}
 /**
- * Returns true if all fields pass validation.
+ * Returns true if all fields pass validation. Will validate hasAndBelongsToMany associations
+ * that use the 'with' key as well. Since __saveMulti is incapable of exiting a save operation.
  *
  * Will validate the currently set data.  Use Model::set() or Model::create() to set the active data.
  *
@@ -2342,13 +2343,16 @@ function query() {
  */
 	function validates($options = array()) {
 		$errors = $this->invalidFields($options);
+		if (empty($errors) && $errors !== false) {
+			$errors = $this->__validateWithModels($options);
+		}
 		if (is_array($errors)) {
 			return count($errors) === 0;
 		}
 		return $errors;
 	}
 /**
- * Returns an array of fields that have failed validation.
+ * Returns an array of fields that have failed validation. On the current model.
  *
  * @param string $options An optional array of custom options to be made available in the beforeValidate callback
  * @return array Array of invalid fields
@@ -2498,6 +2502,40 @@ function invalidFields($options = array()) {
 		$this->validate = $_validate;
 		return $this->validationErrors;
 	}
+/**
+ * Runs validation for hasAndBelongsToMany associations that have 'with' keys
+ * set. And data in the set() data set.
+ *
+ * @param array $options Array of options to use on Valdation of with models
+ * @return boolean Failure of validation on with models.
+ * @access private
+ * @see Model::validates()
+ */
+	function __validateWithModels($options) {
+		$valid = true;
+		foreach ($this->data as $assoc => $data) {
+			if (isset($this->hasAndBelongsToMany[$assoc]) && !empty($this->hasAndBelongsToMany[$assoc]['with'])) {
+				list($join) = $this->joinModel($this->hasAndBelongsToMany[$assoc]['with']);
+				$newData = array();
+				foreach ((array)$data as $row) {
+					if (isset($row[$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
+						$newData[] = $row;
+					} elseif (isset($row[$join]) && isset($row[$join][$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
+						$newData[] = $row[$join];
+					}
+				}
+				if (empty($newData)) {
+					continue;
+				}
+				foreach ($newData as $data) {
+					$data[$this->hasAndBelongsToMany[$assoc]['foreignKey']] = $this->id;
+					$this->{$join}->create($data);
+					$valid = ($valid && $this->{$join}->validates($options));
+				}
+			}
+		}
+		return $valid;
+	}
 /**
  * Marks a field as invalid, optionally setting the name of validation
  * rule (in case of multiple validation for field) that was broken.
diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/cake/tests/cases/libs/model/model_validation.test.php
index eb0b1de8e..a35e4898d 100644
--- a/cake/tests/cases/libs/model/model_validation.test.php
+++ b/cake/tests/cases/libs/model/model_validation.test.php
@@ -121,6 +121,100 @@ function testInvalidFieldsWithFieldListParams() {
 
 		$this->assertEqual($TestModel->validate, $validate);
 	}
+/**
+ * test that validates() checks all the 'with' associations as well for validation
+ * as this can cause partial/wrong data insertion.
+ *
+ * @return void
+ */
+	function testValidatesWithAssociations() {
+		$data = array(
+			'Something' => array(
+				'id' => 5,
+				'title' => 'Extra Fields',
+				'body' => 'Extra Fields Body',
+				'published' => '1'
+			),
+			'SomethingElse' => array(
+				array('something_else_id' => 1, 'doomed' => '')
+			)
+		);
+
+		$Something =& new Something();
+		$JoinThing =& $Something->JoinThing;
+
+		$JoinThing->validate = array('doomed' => array('rule' => 'notEmpty'));
+
+		$expectedError = array('doomed' => 'This field cannot be left blank');
+
+		$Something->create();
+		$result = $Something->save($data);
+		$this->assertFalse($result, 'Save occured even when with models failed. %s');
+		$this->assertEqual($JoinThing->validationErrors, $expectedError);
+		$count = $Something->find('count', array('conditions' => array('Something.id' => $data['Something']['id'])));
+		$this->assertIdentical($count, 0);
+
+		$data = array(
+			'Something' => array(
+				'id' => 5,
+				'title' => 'Extra Fields',
+				'body' => 'Extra Fields Body',
+				'published' => '1'
+			),
+			'SomethingElse' => array(
+				array('something_else_id' => 1, 'doomed' => 1),
+				array('something_else_id' => 1, 'doomed' => '')
+			)
+		);
+		$Something->create();
+		$result = $Something->save($data);
+		$this->assertFalse($result, 'Save occured even when with models failed. %s');
+
+		$joinRecords = $JoinThing->find('count', array(
+			'conditions' => array('JoinThing.something_id' => $data['Something']['id'])
+		));
+		$this->assertEqual($joinRecords, 0, 'Records were saved on the join table. %s');
+	}
+/**
+ * test that saveAll and with models with validation interact well
+ *
+ * @return void
+ */
+	function testValidatesWithModelsAndSaveAll() {
+		$data = array(
+			'Something' => array(
+				'id' => 5,
+				'title' => 'Extra Fields',
+				'body' => 'Extra Fields Body',
+				'published' => '1'
+			),
+			'SomethingElse' => array(
+				array('something_else_id' => 1, 'doomed' => '')
+			)
+		);
+		$Something =& new Something();
+		$JoinThing =& $Something->JoinThing;
+
+		$JoinThing->validate = array('doomed' => array('rule' => 'notEmpty'));
+		$expectedError = array('doomed' => 'This field cannot be left blank');
+
+		$Something->create();
+		$result = $Something->saveAll($data, array('validate' => 'only'));
+		$this->assertFalse($result);
+		$this->assertEqual($JoinThing->validationErrors, $expectedError);
+
+		$Something->create();
+		$result = $Something->saveAll($data, array('validate' => 'first'));
+		$this->assertFalse($result);
+		$this->assertEqual($JoinThing->validationErrors, $expectedError);
 
+		$count = $Something->find('count', array('conditions' => array('Something.id' => $data['Something']['id'])));
+		$this->assertIdentical($count, 0);
+
+		$joinRecords = $JoinThing->find('count', array(
+			'conditions' => array('JoinThing.something_id' => $data['Something']['id'])
+		));
+		$this->assertEqual($joinRecords, 0, 'Records were saved on the join table. %s');
+	}
 }
 ?>
\ No newline at end of file

From 4ac29963a880b5470860291b1dfebcdaed130729 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Tue, 15 Dec 2009 09:25:05 -0500
Subject: [PATCH 144/244] Refactoring Model::__validateWithModels.  Should be
 slightly faster as loops are smaller.

---
 cake/libs/model/model.php | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 7e771a075..f0e0a6e9c 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -2513,26 +2513,29 @@ function invalidFields($options = array()) {
  */
 	function __validateWithModels($options) {
 		$valid = true;
-		foreach ($this->data as $assoc => $data) {
-			if (isset($this->hasAndBelongsToMany[$assoc]) && !empty($this->hasAndBelongsToMany[$assoc]['with'])) {
-				list($join) = $this->joinModel($this->hasAndBelongsToMany[$assoc]['with']);
-				$newData = array();
-				foreach ((array)$data as $row) {
-					if (isset($row[$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
-						$newData[] = $row;
-					} elseif (isset($row[$join]) && isset($row[$join][$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
-						$newData[] = $row[$join];
-					}
-				}
-				if (empty($newData)) {
-					continue;
-				}
-				foreach ($newData as $data) {
-					$data[$this->hasAndBelongsToMany[$assoc]['foreignKey']] = $this->id;
-					$this->{$join}->create($data);
-					$valid = ($valid && $this->{$join}->validates($options));
+		foreach ($this->hasAndBelongsToMany as $assoc => $association) {
+			if (empty($association['with']) || !isset($this->data[$assoc])) {
+				continue;
+			}
+			list($join) = $this->joinModel($this->hasAndBelongsToMany[$assoc]['with']);
+			$data = $this->data[$assoc];
+
+			$newData = array();
+			foreach ((array)$data as $row) {
+				if (isset($row[$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
+					$newData[] = $row;
+				} elseif (isset($row[$join]) && isset($row[$join][$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
+					$newData[] = $row[$join];
 				}
 			}
+			if (empty($newData)) {
+				continue;
+			}
+			foreach ($newData as $data) {
+				$data[$this->hasAndBelongsToMany[$assoc]['foreignKey']] = $this->id;
+				$this->{$join}->create($data);
+				$valid = ($valid && $this->{$join}->validates($options));
+			}
 		}
 		return $valid;
 	}

From bdfb50e6bb72cb95bd96dfe143335bf63a109142 Mon Sep 17 00:00:00 2001
From: real34 <contact@pierre-martin.fr>
Date: Mon, 14 Dec 2009 11:02:35 +0100
Subject: [PATCH 145/244] Fixed a bug in Set::extract. Wrong key returned when
 two arrays are at the extraction level.

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/set.php                  |  2 +-
 cake/tests/cases/libs/set.test.php | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/cake/libs/set.php b/cake/libs/set.php
index 4646387b8..cb9990c07 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -454,7 +454,7 @@ function extract($path, $data = null, $options = array()) {
 								$item = $items[$token];
 								$matches[] = array(
 									'trace' => array_merge($context['trace'], $ctext),
-									'key' => $key,
+									'key' => $token,
 									'item' => $item,
 								);
 								break;
diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index d8da44451..082f0055a 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -1027,6 +1027,20 @@ function testExtract() {
 		$expected = array('Second');
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * testExtractWithArrays method
+ * 
+ * @access public
+ * @return void
+ */
+	function testExtractWithArrays() {
+		$data = array(
+			'Level1' => array(
+				'Level2' => array('test1', 'test2'),
+				'Level2bis' => array('test3', 'test4')));
+		$this->assertEqual(Set::extract('/Level1/Level2', $data), array(array('Level2' => array('test1', 'test2'))));
+		$this->assertEqual(Set::extract('/Level1/Level2bis', $data), array(array('Level2bis' => array('test3', 'test4'))));
+	}
 /**
  * testMatches method
  *
@@ -1099,6 +1113,7 @@ function testMatches() {
 
 
 	}
+	
 /**
  * testSetExtractReturnsEmptyArray method
  *

From aa3a197b26c6e40a7cc9ecd3bf70677fc7dc9ebf Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Wed, 16 Dec 2009 18:40:45 -0500
Subject: [PATCH 146/244] Reformatting test case. Fixes #104

---
 cake/tests/cases/libs/set.test.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index 082f0055a..2b758e49e 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -1037,7 +1037,9 @@ function testExtractWithArrays() {
 		$data = array(
 			'Level1' => array(
 				'Level2' => array('test1', 'test2'),
-				'Level2bis' => array('test3', 'test4')));
+				'Level2bis' => array('test3', 'test4')
+			)
+		);
 		$this->assertEqual(Set::extract('/Level1/Level2', $data), array(array('Level2' => array('test1', 'test2'))));
 		$this->assertEqual(Set::extract('/Level1/Level2bis', $data), array(array('Level2bis' => array('test3', 'test4'))));
 	}
@@ -1113,7 +1115,6 @@ function testMatches() {
 
 
 	}
-	
 /**
  * testSetExtractReturnsEmptyArray method
  *

From c8297ff283e03f7cd0cf1e25b75857271488b107 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Wed, 16 Dec 2009 19:23:29 -0500
Subject: [PATCH 147/244] Minor optimization on Inflector::variable

---
 cake/libs/inflector.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index 66a9f10bd..05b03ce4e 100644
--- a/cake/libs/inflector.php
+++ b/cake/libs/inflector.php
@@ -481,7 +481,7 @@ function classify($tableName) {
 	function variable($string) {
 		$string = Inflector::camelize(Inflector::underscore($string));
 		$replace = strtolower(substr($string, 0, 1));
-		return preg_replace('/\\w/', $replace, $string, 1);
+		return $replace . substr($string, 1);
 	}
 /**
  * Returns a string with all spaces converted to underscores (by default), accented

From bbc72c3703f8097b18ed00c9435735a96f7f0071 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Wed, 16 Dec 2009 21:08:15 -0500
Subject: [PATCH 148/244] Updating use of deprecated split() to use
 preg_split().

---
 cake/libs/l10n.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php
index 95f66c257..7000a808b 100644
--- a/cake/libs/l10n.php
+++ b/cake/libs/l10n.php
@@ -393,7 +393,7 @@ function __setLanguage($language = null) {
  * @access private
  */
 	function __autoLanguage() {
-		$_detectableLanguages = split('[,;]', env('HTTP_ACCEPT_LANGUAGE'));
+		$_detectableLanguages = preg_split('/[,;]/', env('HTTP_ACCEPT_LANGUAGE'));
 		foreach ($_detectableLanguages as $key => $langKey) {
 			$langKey = strtolower($langKey);
 			if (strpos($langKey, '_') !== false) {

From 6356c6ed874e45360af164888776540d56bc5c40 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Fri, 18 Dec 2009 19:05:33 -0500
Subject: [PATCH 149/244] Fixing issue where forms generated with requestAction
 would be missing the _Token fields that Security component creates.  Test
 cases added to ensure that token key does not change when requestAction is
 used. Fixes #68

---
 cake/libs/controller/components/security.php   |  5 ++++-
 .../controller/components/security.test.php    | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index 2e44f45e6..825292e20 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -621,6 +621,10 @@ function _validatePost(&$controller) {
  */
 	function _generateToken(&$controller) {
 		if (isset($controller->params['requested']) && $controller->params['requested'] === 1) {
+			if ($this->Session->check('_Token')) {
+				$tokenData = unserialize($this->Session->read('_Token'));
+				$controller->params['_Token'] = $tokenData;
+			}
 			return false;
 		}
 		$authKey = Security::generateAuthKey();
@@ -651,7 +655,6 @@ function _generateToken(&$controller) {
 		}
 		$controller->params['_Token'] = $token;
 		$this->Session->write('_Token', serialize($token));
-
 		return true;
 	}
 /**
diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php
index d3a3fff5a..cc7798aa4 100644
--- a/cake/tests/cases/libs/controller/components/security.test.php
+++ b/cake/tests/cases/libs/controller/components/security.test.php
@@ -1127,5 +1127,23 @@ function testInvalidAuthHeaders() {
 		$this->assertEqual(count($this->Controller->testHeaders), 1);
 		$this->assertEqual(current($this->Controller->testHeaders), $expected);
 	}
+
+/**
+ * test that a requestAction's controller will have the _Token appended to
+ * the params.
+ *
+ * @return void
+ * @see http://cakephp.lighthouseapp.com/projects/42648/tickets/68
+ */
+	function testSettingTokenForRequestAction() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+
+		$this->Controller->params['requested'] = 1;
+		unset($this->Controller->params['_Token']);
+
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertEqual($this->Controller->params['_Token']['key'], $key);
+	}
 }
 ?>
\ No newline at end of file

From 425dcf2df5ae50af96063ab0634e317edc574745 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Tue, 22 Dec 2009 13:23:55 -0500
Subject: [PATCH 150/244] Applying patch from 'tPl0ch', connect key is set to
 'mysql_connect' when not using persistent connections.  Fixes #132

---
 cake/libs/model/datasources/dbo/dbo_mysql.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index 89c42923e..741a8c072 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -448,13 +448,13 @@ class DboMysql extends DboMysqlBase {
  */
 	function connect() {
 		$config = $this->config;
-		$connect = $config['connect'];
 		$this->connected = false;
 
 		if (!$config['persistent']) {
 			$this->connection = mysql_connect($config['host'] . ':' . $config['port'], $config['login'], $config['password'], true);
+			$config['connect'] = 'mysql_connect';
 		} else {
-			$this->connection = $connect($config['host'] . ':' . $config['port'], $config['login'], $config['password']);
+			$this->connection = mysql_pconnect($config['host'] . ':' . $config['port'], $config['login'], $config['password']);
 		}
 
 		if (mysql_select_db($config['database'], $this->connection)) {

From 3c88d817352d2217c6725cf09f48fa5eefe89379 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Fri, 1 Jan 2010 23:34:11 -0500
Subject: [PATCH 151/244] Adding tests for model method validation with
 multiple parameters and addition of original validation rule to method
 params.  Closes #149

---
 .../libs/model/model_validation.test.php      | 50 +++++++++++++++++++
 cake/tests/cases/libs/model/models.php        | 10 ++++
 2 files changed, 60 insertions(+)

diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/cake/tests/cases/libs/model/model_validation.test.php
index a35e4898d..54aa474e3 100644
--- a/cake/tests/cases/libs/model/model_validation.test.php
+++ b/cake/tests/cases/libs/model/model_validation.test.php
@@ -73,6 +73,56 @@ function testValidationParams() {
 		);
 
 		$this->assertEqual($TestModel->invalidFields(), $expected);
+
+		$TestModel->validate['title'] = array(
+			'rule' => array('customValidatorWithSixParams', 'one', 'two', null, 'four'),
+			'required' => true
+		);
+		$TestModel->create(array('title' => 'foo'));
+		$TestModel->invalidFields();
+		$expected = array(
+			'data' => array(
+				'title' => 'foo'
+			),
+			'one' => 'one',
+			'two' => 'two',
+			'three' => null,
+			'four' => 'four',
+			'five' => array(
+				'rule' => array(1 => 'one', 2 => 'two', 3 => null, 4 => 'four'),
+				'on' => null,
+				'last' => false,
+				'allowEmpty' => false,
+				'required' => true
+			),
+			'six' => 6
+		);
+		$this->assertEqual($TestModel->validatorParams, $expected);
+
+		$TestModel->validate['title'] = array(
+			'rule' => array('customValidatorWithSixParams', 'one', array('two'), null, 'four', array('five' => 5)),
+			'required' => true
+		);
+		$TestModel->create(array('title' => 'foo'));
+		$TestModel->invalidFields();
+		$expected = array(
+			'data' => array(
+				'title' => 'foo'
+			),
+			'one' => 'one',
+			'two' => array('two'),
+			'three' => null,
+			'four' => 'four',
+			'five' => array('five' => 5),
+			'six' => array(
+				'rule' => array(1 => 'one', 2 => array('two'), 3 => null, 4 => 'four', 5 => array('five' => 5)),
+				'on' => null,
+				'last' => false,
+				'allowEmpty' => false,
+				'required' => true
+			)
+		);
+		$this->assertEqual($TestModel->validatorParams, $expected);
 	}
 /**
  * Tests validation parameter fieldList in invalidFields
diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index 33ca715fa..cb2089679 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -1939,6 +1939,16 @@ function customValidatorWithParams($data, $validator, $or = true, $ignore_on_sam
 	function customValidatorWithMessage($data) {
 		return 'This field will *never* validate! Muhahaha!';
 	}
+/**
+ * Test validation with many parameters
+ *
+ * @return void
+ */
+	function customValidatorWithSixParams($data, $one = 1, $two = 2, $three = 3, $four = 4, $five = 5, $six = 6) {
+		$this->validatorParams = get_defined_vars();
+		unset($this->validatorParams['this']);
+		return true;
+	}
 }
 /**
  * ValidationTest2 class

From 026eeb645b6959115bacd0bf690db9edfb5ac167 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Fri, 1 Jan 2010 23:58:07 -0500
Subject: [PATCH 152/244] Correcting and improving doc block for
 Model::__construct.

---
 cake/libs/model/model.php | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index f0e0a6e9c..c7fd52c6c 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -333,9 +333,34 @@ class Model extends Overloadable {
 /**
  * Constructor. Binds the model's database table to the object.
  *
- * @param integer $id Set this ID for this model on startup
+ * If `$id` is an array it can be used to pass several options into the model.
+ *
+ * - id - The id to start the model on.
+ * - table - The table to use for this model.
+ * - ds - The connection name this model is connected to.
+ * - name - The name of the model eg. Post.
+ * - alias - The alias of the model, this is used for registering the instance in the `ClassRegistry`.
+ *   eg. `ParentThread`
+ *
+ * ### Overriding Model's __construct method.
+ * 
+ * When overriding Model::__construct() be careful to include and pass in all 3 of the 
+ * arguments to `parent::__construct($id, $table, $ds);`
+ *
+ * ### Dynamically creating models
+ *
+ * You can dynamically create model instances using the the $id array syntax.
+ * 
+ * {{{
+ * $Post = new Model(array('table' => 'posts', 'name' => 'Post', 'ds' => 'connection2'));
+ * }}}
+ *
+ * Would create a model attached to the posts table on connection2.  Dynamic model creation is useful
+ * when you want a model object that contains no associations or attached behaviors.
+ *
+ * @param mixed $id Set this ID for this model on startup, can also be an array of options, see above.
  * @param string $table Name of database table to use.
- * @param object $ds DataSource connection object.
+ * @param string $ds DataSource connection name.
  */
 	function __construct($id = false, $table = null, $ds = null) {
 		parent::__construct();

From 730153b1516f368a73dcae8efcfa025b9187b062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Perras?= <joel.perras@gmail.com>
Date: Thu, 7 Jan 2010 17:49:57 -0500
Subject: [PATCH 153/244] Adding isset() checks for CakeSchema::compare() when
 diff'ing db indexes.

Allows for slightly better interoperability between schemas generated with CakePHP 1.2 and with 1.3
---
 cake/libs/model/schema.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/cake/libs/model/schema.php b/cake/libs/model/schema.php
index d607dbf57..d1a455290 100644
--- a/cake/libs/model/schema.php
+++ b/cake/libs/model/schema.php
@@ -168,7 +168,7 @@ function load($options = array()) {
  * Reads database and creates schema tables
  *
  * Options
- * 
+ *
  * - 'connection' - the db connection to use
  * - 'name' - name of the schema
  * - 'models' - a list of models to use, or false to ignore models
@@ -428,8 +428,12 @@ function compare($old, $new = null) {
 			if (isset($old[$table]['indexes']) && isset($new[$table]['indexes'])) {
 				$diff = $this->_compareIndexes($new[$table]['indexes'], $old[$table]['indexes']);
 				if ($diff) {
-					$tables[$table]['drop']['indexes'] = $diff['drop'];
-					$tables[$table]['add']['indexes'] = $diff['add'];
+					if (isset($tables[$table]['drop']['indexes']) && isset($diff['drop'])) {
+						$tables[$table]['drop']['indexes'] = $diff['drop'];
+					}
+					if (isset($tables[$table]['add']['indexes']) && isset($diff['add'])) {
+						$tables[$table]['add']['indexes'] = $diff['add'];
+					}
 				}
 			}
 		}

From 11a5403aaf4049b4a3e605b14057ba17ff093990 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Fri, 8 Jan 2010 18:35:01 -0500
Subject: [PATCH 154/244] Removing unused variables from inflections.php. 
 These variables are artifacts from previous refactorings and have been
 non-functional for quite sometime.  Fixes #163

---
 app/config/inflections.php | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/app/config/inflections.php b/app/config/inflections.php
index ed8c08b3d..07ca6d2a8 100644
--- a/app/config/inflections.php
+++ b/app/config/inflections.php
@@ -53,18 +53,5 @@
  *  $singularRules = array('/(s)tatuses$/i' => '\1\2tatus', '/(matr)ices$/i' =>'\1ix','/(vert|ind)ices$/i')
  */
 	$singularRules = array();
-/**
- * This is a key only array of singular words that should not be inflected.
- * You should not have to change this value below if you do change it use same format
- * as the $uninflectedPlural above.
- */
-	$uninflectedSingular = $uninflectedPlural;
-/**
- * This is a key => value array of singular irregular words.
- * Most of the time this will be a reverse of the above $irregularPlural array
- * You should not have to change this value below if you do change it use same format
- *
- * $irregularSingular = array('atlases' => 'atlas', 'beefs' => 'beef', 'brothers' => 'brother')
- */
-	$irregularSingular = array_flip($irregularPlural);
+
 ?>
\ No newline at end of file

From 5149d65c7e5516d255b507ee61fe709983f1c874 Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Mon, 11 Jan 2010 13:46:21 -0200
Subject: [PATCH 155/244] Adding redirect to baked controllers so when no
 delete could be done an error page is not displayed. Fixes #188

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/console/libs/tasks/controller.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index 428cdcebe..d4ab58abe 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -386,6 +386,12 @@ function bakeActions($controllerName, $admin = null, $wannaUseSession = true) {
 			$actions .= "\t\t\t\$this->flash(__('{$singularHumanName} deleted', true), array('action' => 'index'));\n";
 		}
 		$actions .= "\t\t}\n";
+		if ($wannaUseSession) {
+			$actions .= "\t\t\$this->Session->setFlash(__('The {$singularHumanName} could not be deleted. Please, try again.', true));\n";
+			$actions .= "\t\t\$this->redirect(array('action' => 'index'));\n";
+		} else {
+			$actions .= "\t\t\$this->flash(__('The {$singularHumanName} could not be deleted. Please, try again.', true), array('action' => 'index'));\n";
+		}
 		$actions .= "\t}\n";
 		$actions .= "\n";
 		return $actions;

From 4e3aedecde62e30c726e2f60aba4d7b8f6b5030b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Lorenzo=20Rodr=C3=ADguez?= <jose.zap@gmail.com>
Date: Wed, 13 Jan 2010 09:21:36 -0430
Subject: [PATCH 156/244] Fixing persitModel and plugin Behaviors. Closes #192

---
 cake/libs/model/behavior.php                  |  3 ++
 cake/tests/cases/libs/object.test.php         | 23 +++++++++--
 cake/tests/test_app/models/persister_one.php  |  2 +-
 cake/tests/test_app/models/persister_two.php  |  2 +-
 .../behaviors/test_plugin_persister_one.php   | 38 +++++++++++++++++++
 .../behaviors/test_plugin_persister_two.php   | 38 +++++++++++++++++++
 6 files changed, 100 insertions(+), 6 deletions(-)
 create mode 100644 cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
 create mode 100644 cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php

diff --git a/cake/libs/model/behavior.php b/cake/libs/model/behavior.php
index fdbc64e30..0f994c2c9 100644
--- a/cake/libs/model/behavior.php
+++ b/cake/libs/model/behavior.php
@@ -286,6 +286,9 @@ function attach($behavior, $config = array()) {
 					$this->{$name} =& new $class;
 				}
 				ClassRegistry::addObject($class, $this->{$name});
+				if (!empty($plugin)) {
+					ClassRegistry::addObject($plugin.'.'.$class, $clas);
+				}
 			}
 		} elseif (isset($this->{$name}->settings) && isset($this->{$name}->settings[$this->modelName])) {
 			if ($config !== null && $config !== false) {
diff --git a/cake/tests/cases/libs/object.test.php b/cake/tests/cases/libs/object.test.php
index 743d88da1..3ce6fbbfd 100644
--- a/cake/tests/cases/libs/object.test.php
+++ b/cake/tests/cases/libs/object.test.php
@@ -425,10 +425,12 @@ function testPersistWithBehavior() {
 		Configure::write('Cache.disable', false);
 
 		Configure::write('modelPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models'. DS));
+		Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins'. DS));
 		Configure::write('behaviorPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models'. DS . 'behaviors' . DS));
 
 		$this->assertFalse(class_exists('PersisterOneBehaviorBehavior'));
 		$this->assertFalse(class_exists('PersisterTwoBehaviorBehavior'));
+		$this->assertFalse(class_exists('TestPluginPersisterBehavior'));
 
 		$Controller = new RequestActionPersistentController();
 		$Controller->persistModel = true;
@@ -439,11 +441,11 @@ function testPersistWithBehavior() {
 
 		$contents = str_replace('"PersisterOne"', '"PersisterTwo"', file_get_contents(CACHE . 'persistent' . DS . 'persisteroneregistry.php'));
 		$contents = str_replace('persister_one_', 'persister_two_', file_get_contents(CACHE . 'persistent' . DS . 'persisteroneregistry.php'));
-
 		$result = file_put_contents(CACHE . 'persistent' . DS . 'persisteroneregistry.php', $contents);
 
 		$this->assertTrue(class_exists('PersisterOneBehaviorBehavior'));
 		$this->assertFalse(class_exists('PersisterTwoBehaviorBehavior'));
+		$this->assertFalse(class_exists('TestPluginPersisterTwoBehavior'));
 
 		$Controller = new RequestActionPersistentController();
 		$Controller->persistModel = true;
@@ -451,6 +453,7 @@ function testPersistWithBehavior() {
 
 		$this->assertTrue(class_exists('PersisterOneBehaviorBehavior'));
 		$this->assertTrue(class_exists('PersisterTwoBehaviorBehavior'));
+		$this->assertTrue(class_exists('TestPluginPersisterTwoBehavior'));
 
 		@unlink(CACHE . 'persistent' . DS . 'persisterone.php');
 		@unlink(CACHE . 'persistent' . DS . 'persisteroneregistry.php');
@@ -484,7 +487,13 @@ function testPersistWithBehaviorAndRequestAction() {
 		$this->assertTrue(file_exists(CACHE . 'persistent' . DS . 'persisteroneregistry.php'));
 
 		$keys = ClassRegistry::keys();
-		$this->assertEqual($keys, array('persister_one', 'comment', 'persister_one_behavior_behavior'));
+		$this->assertEqual($keys, array(
+			'persister_one',
+			'comment',
+			'persister_one_behavior_behavior',
+			'test_plugin_persister_one_behavior',
+			'test_plugin.test_plugin_persister_one_behavior'
+		));
 
 		ob_start();
 		$Controller->set('content_for_layout', 'cool');
@@ -492,8 +501,14 @@ function testPersistWithBehaviorAndRequestAction() {
 		$result = ob_get_clean();
 
 		$keys = ClassRegistry::keys();
-		$this->assertEqual($keys, array('persister_one', 'comment', 'persister_one_behavior_behavior', 'view'));
-
+		$this->assertEqual($keys, array(
+			'persister_one',
+			'comment',
+			'persister_one_behavior_behavior',
+			'test_plugin_persister_one_behavior',
+			'test_plugin.test_plugin_persister_one_behavior',
+			'view'
+		));
 		$result = $this->object->requestAction('/request_action_persistent/index');
 		$expected = 'This is a test';
 		$this->assertEqual($result, $expected);
diff --git a/cake/tests/test_app/models/persister_one.php b/cake/tests/test_app/models/persister_one.php
index 76222829f..37fd2b4ef 100644
--- a/cake/tests/test_app/models/persister_one.php
+++ b/cake/tests/test_app/models/persister_one.php
@@ -28,7 +28,7 @@ class PersisterOne extends AppModel {
 	var $useTable = 'posts';
 	var $name = 'PersisterOne';
 
-	var $actsAs = array('PersisterOneBehavior');
+	var $actsAs = array('PersisterOneBehavior','TestPlugin.TestPluginPersisterOne');
 
 	var $hasMany = array('Comment');
 }
diff --git a/cake/tests/test_app/models/persister_two.php b/cake/tests/test_app/models/persister_two.php
index 4596f9479..36d2423da 100644
--- a/cake/tests/test_app/models/persister_two.php
+++ b/cake/tests/test_app/models/persister_two.php
@@ -28,7 +28,7 @@ class PersisterTwo extends AppModel {
 	var $useTable = 'posts';
 	var $name = 'PersisterTwo';
 
-	var $actsAs = array('PersisterOneBehavior');
+	var $actsAs = array('PersisterOneBehavior','TestPlugin.TestPluginPersisterOne');
 
 	var $hasMany = array('Comment');
 }
diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
new file mode 100644
index 000000000..5530fd286
--- /dev/null
+++ b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
@@ -0,0 +1,38 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Behavior for binding management.
+ *
+ * Behavior to simplify manipulating a model's bindings when doing a find operation
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.test_app.models
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+/**
+ * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
+ * the amount of associations and data returned.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ */
+class TestPluginPersisterOneBehavior extends ModelBehavior {
+	
+	
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
new file mode 100644
index 000000000..89f2def32
--- /dev/null
+++ b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
@@ -0,0 +1,38 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Behavior for binding management.
+ *
+ * Behavior to simplify manipulating a model's bindings when doing a find operation
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.test_app.models
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+/**
+ * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
+ * the amount of associations and data returned.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ */
+class TestPluginPersisterTwoBehavior extends ModelBehavior {
+	
+	
+}
+?>
\ No newline at end of file

From 15b8a3ec716f1ff14e003d1938ce8d7fcb0e20c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Perras?= <joel.perras@gmail.com>
Date: Wed, 13 Jan 2010 23:47:14 -0500
Subject: [PATCH 157/244] Updating copyright date on all files.

---
 app/config/acl.ini.php                                        | 4 ++--
 app/config/bootstrap.php                                      | 4 ++--
 app/config/core.php                                           | 4 ++--
 app/config/database.php.default                               | 4 ++--
 app/config/inflections.php                                    | 4 ++--
 app/config/routes.php                                         | 4 ++--
 app/config/sql/db_acl.php                                     | 4 ++--
 app/config/sql/db_acl.sql                                     | 2 +-
 app/config/sql/i18n.php                                       | 4 ++--
 app/config/sql/i18n.sql                                       | 2 +-
 app/config/sql/sessions.php                                   | 4 ++--
 app/config/sql/sessions.sql                                   | 2 +-
 app/index.php                                                 | 4 ++--
 app/webroot/css.php                                           | 4 ++--
 app/webroot/css/cake.generic.css                              | 4 ++--
 app/webroot/index.php                                         | 4 ++--
 app/webroot/js/vendors.php                                    | 4 ++--
 app/webroot/test.php                                          | 4 ++--
 cake/LICENSE.txt                                              | 2 +-
 cake/basics.php                                               | 4 ++--
 cake/bootstrap.php                                            | 4 ++--
 cake/config/config.php                                        | 4 ++--
 cake/config/paths.php                                         | 4 ++--
 cake/config/unicode/casefolding/0080_00ff.php                 | 4 ++--
 cake/config/unicode/casefolding/0100_017f.php                 | 4 ++--
 cake/config/unicode/casefolding/0180_024F.php                 | 4 ++--
 cake/config/unicode/casefolding/0250_02af.php                 | 4 ++--
 cake/config/unicode/casefolding/0370_03ff.php                 | 4 ++--
 cake/config/unicode/casefolding/0400_04ff.php                 | 4 ++--
 cake/config/unicode/casefolding/0500_052f.php                 | 4 ++--
 cake/config/unicode/casefolding/0530_058f.php                 | 4 ++--
 cake/config/unicode/casefolding/1e00_1eff.php                 | 4 ++--
 cake/config/unicode/casefolding/1f00_1fff.php                 | 4 ++--
 cake/config/unicode/casefolding/2100_214f.php                 | 4 ++--
 cake/config/unicode/casefolding/2150_218f.php                 | 4 ++--
 cake/config/unicode/casefolding/2460_24ff.php                 | 4 ++--
 cake/config/unicode/casefolding/2c00_2c5f.php                 | 4 ++--
 cake/config/unicode/casefolding/2c60_2c7f.php                 | 4 ++--
 cake/config/unicode/casefolding/2c80_2cff.php                 | 4 ++--
 cake/config/unicode/casefolding/ff00_ffef.php                 | 4 ++--
 cake/console/cake                                             | 4 ++--
 cake/console/cake.bat                                         | 4 ++--
 cake/console/cake.php                                         | 4 ++--
 cake/console/error.php                                        | 4 ++--
 cake/console/libs/acl.php                                     | 4 ++--
 cake/console/libs/api.php                                     | 4 ++--
 cake/console/libs/bake.php                                    | 4 ++--
 cake/console/libs/console.php                                 | 4 ++--
 cake/console/libs/i18n.php                                    | 4 ++--
 cake/console/libs/schema.php                                  | 4 ++--
 cake/console/libs/shell.php                                   | 4 ++--
 cake/console/libs/tasks/controller.php                        | 4 ++--
 cake/console/libs/tasks/db_config.php                         | 4 ++--
 cake/console/libs/tasks/extract.php                           | 4 ++--
 cake/console/libs/tasks/model.php                             | 4 ++--
 cake/console/libs/tasks/plugin.php                            | 4 ++--
 cake/console/libs/tasks/project.php                           | 4 ++--
 cake/console/libs/tasks/test.php                              | 4 ++--
 cake/console/libs/tasks/view.php                              | 4 ++--
 cake/console/libs/templates/skel/app_controller.php           | 4 ++--
 cake/console/libs/templates/skel/app_helper.php               | 4 ++--
 cake/console/libs/templates/skel/app_model.php                | 4 ++--
 cake/console/libs/templates/skel/config/acl.ini.php           | 4 ++--
 cake/console/libs/templates/skel/config/bootstrap.php         | 4 ++--
 cake/console/libs/templates/skel/config/core.php              | 4 ++--
 cake/console/libs/templates/skel/config/database.php.default  | 4 ++--
 cake/console/libs/templates/skel/config/inflections.php       | 4 ++--
 cake/console/libs/templates/skel/config/routes.php            | 4 ++--
 cake/console/libs/templates/skel/config/sql/db_acl.php        | 4 ++--
 cake/console/libs/templates/skel/config/sql/db_acl.sql        | 2 +-
 cake/console/libs/templates/skel/config/sql/i18n.php          | 4 ++--
 cake/console/libs/templates/skel/config/sql/i18n.sql          | 2 +-
 cake/console/libs/templates/skel/config/sql/sessions.php      | 4 ++--
 cake/console/libs/templates/skel/config/sql/sessions.sql      | 2 +-
 .../libs/templates/skel/controllers/pages_controller.php      | 4 ++--
 cake/console/libs/templates/skel/index.php                    | 4 ++--
 .../libs/templates/skel/views/elements/email/html/default.ctp | 4 ++--
 .../libs/templates/skel/views/elements/email/text/default.ctp | 4 ++--
 cake/console/libs/templates/skel/views/layouts/ajax.ctp       | 4 ++--
 cake/console/libs/templates/skel/views/layouts/default.ctp    | 4 ++--
 .../libs/templates/skel/views/layouts/email/html/default.ctp  | 4 ++--
 .../libs/templates/skel/views/layouts/email/text/default.ctp  | 4 ++--
 cake/console/libs/templates/skel/views/layouts/flash.ctp      | 4 ++--
 cake/console/libs/templates/skel/webroot/css.php              | 4 ++--
 cake/console/libs/templates/skel/webroot/css/cake.generic.css | 4 ++--
 cake/console/libs/templates/skel/webroot/index.php            | 4 ++--
 cake/console/libs/templates/skel/webroot/js/vendors.php       | 4 ++--
 cake/console/libs/templates/skel/webroot/test.php             | 4 ++--
 cake/console/libs/templates/views/form.ctp                    | 4 ++--
 cake/console/libs/templates/views/index.ctp                   | 4 ++--
 cake/console/libs/templates/views/view.ctp                    | 4 ++--
 cake/console/libs/testsuite.php                               | 4 ++--
 cake/dispatcher.php                                           | 4 ++--
 cake/libs/cache.php                                           | 4 ++--
 cake/libs/cache/apc.php                                       | 4 ++--
 cake/libs/cache/file.php                                      | 4 ++--
 cake/libs/cache/memcache.php                                  | 4 ++--
 cake/libs/cache/xcache.php                                    | 4 ++--
 cake/libs/cake_log.php                                        | 4 ++--
 cake/libs/class_registry.php                                  | 4 ++--
 cake/libs/configure.php                                       | 4 ++--
 cake/libs/controller/app_controller.php                       | 4 ++--
 cake/libs/controller/component.php                            | 4 ++--
 cake/libs/controller/components/acl.php                       | 4 ++--
 cake/libs/controller/components/auth.php                      | 4 ++--
 cake/libs/controller/components/cookie.php                    | 4 ++--
 cake/libs/controller/components/email.php                     | 4 ++--
 cake/libs/controller/components/request_handler.php           | 4 ++--
 cake/libs/controller/components/security.php                  | 4 ++--
 cake/libs/controller/components/session.php                   | 4 ++--
 cake/libs/controller/controller.php                           | 4 ++--
 cake/libs/controller/pages_controller.php                     | 4 ++--
 cake/libs/controller/scaffold.php                             | 4 ++--
 cake/libs/debugger.php                                        | 4 ++--
 cake/libs/error.php                                           | 4 ++--
 cake/libs/file.php                                            | 4 ++--
 cake/libs/flay.php                                            | 4 ++--
 cake/libs/folder.php                                          | 4 ++--
 cake/libs/http_socket.php                                     | 4 ++--
 cake/libs/i18n.php                                            | 4 ++--
 cake/libs/inflector.php                                       | 4 ++--
 cake/libs/l10n.php                                            | 4 ++--
 cake/libs/magic_db.php                                        | 4 ++--
 cake/libs/model/app_model.php                                 | 4 ++--
 cake/libs/model/behavior.php                                  | 4 ++--
 cake/libs/model/behaviors/acl.php                             | 4 ++--
 cake/libs/model/behaviors/containable.php                     | 4 ++--
 cake/libs/model/behaviors/translate.php                       | 4 ++--
 cake/libs/model/behaviors/tree.php                            | 4 ++--
 cake/libs/model/connection_manager.php                        | 4 ++--
 cake/libs/model/datasources/datasource.php                    | 4 ++--
 cake/libs/model/datasources/dbo/dbo_adodb.php                 | 4 ++--
 cake/libs/model/datasources/dbo/dbo_db2.php                   | 2 +-
 cake/libs/model/datasources/dbo/dbo_firebird.php              | 4 ++--
 cake/libs/model/datasources/dbo/dbo_mssql.php                 | 4 ++--
 cake/libs/model/datasources/dbo/dbo_mysql.php                 | 4 ++--
 cake/libs/model/datasources/dbo/dbo_mysqli.php                | 4 ++--
 cake/libs/model/datasources/dbo/dbo_odbc.php                  | 4 ++--
 cake/libs/model/datasources/dbo/dbo_oracle.php                | 4 ++--
 cake/libs/model/datasources/dbo/dbo_postgres.php              | 4 ++--
 cake/libs/model/datasources/dbo/dbo_sqlite.php                | 4 ++--
 cake/libs/model/datasources/dbo/dbo_sybase.php                | 4 ++--
 cake/libs/model/datasources/dbo_source.php                    | 4 ++--
 cake/libs/model/db_acl.php                                    | 4 ++--
 cake/libs/model/model.php                                     | 4 ++--
 cake/libs/model/schema.php                                    | 4 ++--
 cake/libs/multibyte.php                                       | 4 ++--
 cake/libs/object.php                                          | 4 ++--
 cake/libs/overloadable.php                                    | 4 ++--
 cake/libs/overloadable_php4.php                               | 4 ++--
 cake/libs/overloadable_php5.php                               | 4 ++--
 cake/libs/router.php                                          | 4 ++--
 cake/libs/sanitize.php                                        | 4 ++--
 cake/libs/security.php                                        | 4 ++--
 cake/libs/session.php                                         | 4 ++--
 cake/libs/set.php                                             | 4 ++--
 cake/libs/socket.php                                          | 4 ++--
 cake/libs/string.php                                          | 4 ++--
 cake/libs/validation.php                                      | 4 ++--
 cake/libs/view/elements/dump.ctp                              | 4 ++--
 cake/libs/view/elements/email/html/default.ctp                | 4 ++--
 cake/libs/view/elements/email/text/default.ctp                | 4 ++--
 cake/libs/view/errors/error404.ctp                            | 4 ++--
 cake/libs/view/errors/missing_action.ctp                      | 4 ++--
 cake/libs/view/errors/missing_component_class.ctp             | 4 ++--
 cake/libs/view/errors/missing_component_file.ctp              | 4 ++--
 cake/libs/view/errors/missing_connection.ctp                  | 4 ++--
 cake/libs/view/errors/missing_controller.ctp                  | 4 ++--
 cake/libs/view/errors/missing_helper_class.ctp                | 4 ++--
 cake/libs/view/errors/missing_helper_file.ctp                 | 4 ++--
 cake/libs/view/errors/missing_layout.ctp                      | 4 ++--
 cake/libs/view/errors/missing_model.ctp                       | 4 ++--
 cake/libs/view/errors/missing_scaffolddb.ctp                  | 4 ++--
 cake/libs/view/errors/missing_table.ctp                       | 4 ++--
 cake/libs/view/errors/missing_view.ctp                        | 4 ++--
 cake/libs/view/errors/private_action.ctp                      | 4 ++--
 cake/libs/view/errors/scaffold_error.ctp                      | 4 ++--
 cake/libs/view/helper.php                                     | 4 ++--
 cake/libs/view/helpers/ajax.php                               | 4 ++--
 cake/libs/view/helpers/app_helper.php                         | 4 ++--
 cake/libs/view/helpers/cache.php                              | 4 ++--
 cake/libs/view/helpers/form.php                               | 4 ++--
 cake/libs/view/helpers/html.php                               | 4 ++--
 cake/libs/view/helpers/javascript.php                         | 4 ++--
 cake/libs/view/helpers/js.php                                 | 4 ++--
 cake/libs/view/helpers/number.php                             | 4 ++--
 cake/libs/view/helpers/paginator.php                          | 4 ++--
 cake/libs/view/helpers/rss.php                                | 4 ++--
 cake/libs/view/helpers/session.php                            | 4 ++--
 cake/libs/view/helpers/text.php                               | 4 ++--
 cake/libs/view/helpers/time.php                               | 4 ++--
 cake/libs/view/helpers/xml.php                                | 4 ++--
 cake/libs/view/layouts/ajax.ctp                               | 4 ++--
 cake/libs/view/layouts/default.ctp                            | 4 ++--
 cake/libs/view/layouts/email/html/default.ctp                 | 4 ++--
 cake/libs/view/layouts/email/text/default.ctp                 | 4 ++--
 cake/libs/view/layouts/flash.ctp                              | 4 ++--
 cake/libs/view/media.php                                      | 4 ++--
 cake/libs/view/pages/home.ctp                                 | 4 ++--
 cake/libs/view/scaffolds/edit.ctp                             | 4 ++--
 cake/libs/view/scaffolds/index.ctp                            | 4 ++--
 cake/libs/view/scaffolds/view.ctp                             | 4 ++--
 cake/libs/view/theme.php                                      | 4 ++--
 cake/libs/view/view.php                                       | 4 ++--
 cake/libs/xml.php                                             | 4 ++--
 cake/tests/cases/basics.test.php                              | 4 ++--
 cake/tests/cases/console/cake.test.php                        | 4 ++--
 cake/tests/cases/console/libs/acl.test.php                    | 4 ++--
 cake/tests/cases/console/libs/api.test.php                    | 4 ++--
 cake/tests/cases/console/libs/schema.test.php                 | 4 ++--
 cake/tests/cases/console/libs/shell.test.php                  | 4 ++--
 cake/tests/cases/console/libs/tasks/extract.test.php          | 4 ++--
 cake/tests/cases/console/libs/tasks/model.test.php            | 4 ++--
 cake/tests/cases/console/libs/tasks/test.test.php             | 4 ++--
 cake/tests/cases/dispatcher.test.php                          | 4 ++--
 cake/tests/cases/libs/cache.test.php                          | 4 ++--
 cake/tests/cases/libs/cache/apc.test.php                      | 4 ++--
 cake/tests/cases/libs/cache/file.test.php                     | 4 ++--
 cake/tests/cases/libs/cache/memcache.test.php                 | 4 ++--
 cake/tests/cases/libs/cache/xcache.test.php                   | 4 ++--
 cake/tests/cases/libs/cake_log.test.php                       | 4 ++--
 cake/tests/cases/libs/cake_test_case.test.php                 | 4 ++--
 cake/tests/cases/libs/cake_test_fixture.test.php              | 4 ++--
 cake/tests/cases/libs/class_registry.test.php                 | 4 ++--
 cake/tests/cases/libs/code_coverage_manager.test.php          | 4 ++--
 cake/tests/cases/libs/configure.test.php                      | 4 ++--
 cake/tests/cases/libs/controller/component.test.php           | 4 ++--
 cake/tests/cases/libs/controller/components/acl.test.php      | 4 ++--
 cake/tests/cases/libs/controller/components/auth.test.php     | 4 ++--
 cake/tests/cases/libs/controller/components/cookie.test.php   | 4 ++--
 cake/tests/cases/libs/controller/components/email.test.php    | 4 ++--
 .../cases/libs/controller/components/request_handler.test.php | 4 ++--
 cake/tests/cases/libs/controller/components/security.test.php | 4 ++--
 cake/tests/cases/libs/controller/components/session.test.php  | 4 ++--
 cake/tests/cases/libs/controller/controller.test.php          | 4 ++--
 .../cases/libs/controller/controller_merge_vars.test.php      | 4 ++--
 cake/tests/cases/libs/controller/pages_controller.test.php    | 4 ++--
 cake/tests/cases/libs/controller/scaffold.test.php            | 4 ++--
 cake/tests/cases/libs/debugger.test.php                       | 4 ++--
 cake/tests/cases/libs/error.test.php                          | 4 ++--
 cake/tests/cases/libs/file.test.php                           | 4 ++--
 cake/tests/cases/libs/flay.test.php                           | 4 ++--
 cake/tests/cases/libs/folder.test.php                         | 4 ++--
 cake/tests/cases/libs/http_socket.test.php                    | 4 ++--
 cake/tests/cases/libs/i18n.test.php                           | 4 ++--
 cake/tests/cases/libs/inflector.test.php                      | 4 ++--
 cake/tests/cases/libs/l10n.test.php                           | 4 ++--
 cake/tests/cases/libs/magic_db.test.php                       | 4 ++--
 cake/tests/cases/libs/model/behaviors/acl.test.php            | 4 ++--
 cake/tests/cases/libs/model/behaviors/containable.test.php    | 4 ++--
 cake/tests/cases/libs/model/behaviors/translate.test.php      | 4 ++--
 cake/tests/cases/libs/model/behaviors/tree.test.php           | 4 ++--
 cake/tests/cases/libs/model/connection_manager.test.php       | 4 ++--
 .../tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php | 4 ++--
 .../tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php | 4 ++--
 .../tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php | 4 ++--
 .../cases/libs/model/datasources/dbo/dbo_mysqli.test.php      | 4 ++--
 .../cases/libs/model/datasources/dbo/dbo_oracle.test.php      | 4 ++--
 .../cases/libs/model/datasources/dbo/dbo_postgres.test.php    | 4 ++--
 .../cases/libs/model/datasources/dbo/dbo_sqlite.test.php      | 4 ++--
 cake/tests/cases/libs/model/datasources/dbo_source.test.php   | 4 ++--
 cake/tests/cases/libs/model/db_acl.test.php                   | 4 ++--
 cake/tests/cases/libs/model/model.test.php                    | 4 ++--
 cake/tests/cases/libs/model/model_delete.test.php             | 4 ++--
 cake/tests/cases/libs/model/model_integration.test.php        | 4 ++--
 cake/tests/cases/libs/model/model_read.test.php               | 4 ++--
 cake/tests/cases/libs/model/model_validation.test.php         | 4 ++--
 cake/tests/cases/libs/model/model_write.test.php              | 4 ++--
 cake/tests/cases/libs/model/models.php                        | 4 ++--
 cake/tests/cases/libs/model/schema.test.php                   | 4 ++--
 cake/tests/cases/libs/multibyte.test.php                      | 4 ++--
 cake/tests/cases/libs/object.test.php                         | 4 ++--
 cake/tests/cases/libs/overloadable.test.php                   | 4 ++--
 cake/tests/cases/libs/router.test.php                         | 4 ++--
 cake/tests/cases/libs/sanitize.test.php                       | 4 ++--
 cake/tests/cases/libs/security.test.php                       | 4 ++--
 cake/tests/cases/libs/session.test.php                        | 4 ++--
 cake/tests/cases/libs/set.test.php                            | 4 ++--
 cake/tests/cases/libs/socket.test.php                         | 4 ++--
 cake/tests/cases/libs/string.test.php                         | 4 ++--
 cake/tests/cases/libs/test_manager.test.php                   | 4 ++--
 cake/tests/cases/libs/validation.test.php                     | 4 ++--
 cake/tests/cases/libs/view/helper.test.php                    | 4 ++--
 cake/tests/cases/libs/view/helpers/ajax.test.php              | 4 ++--
 cake/tests/cases/libs/view/helpers/cache.test.php             | 4 ++--
 cake/tests/cases/libs/view/helpers/form.test.php              | 4 ++--
 cake/tests/cases/libs/view/helpers/html.test.php              | 4 ++--
 cake/tests/cases/libs/view/helpers/javascript.test.php        | 4 ++--
 cake/tests/cases/libs/view/helpers/js.test.php                | 4 ++--
 cake/tests/cases/libs/view/helpers/number.test.php            | 4 ++--
 cake/tests/cases/libs/view/helpers/paginator.test.php         | 4 ++--
 cake/tests/cases/libs/view/helpers/rss.test.php               | 4 ++--
 cake/tests/cases/libs/view/helpers/session.test.php           | 4 ++--
 cake/tests/cases/libs/view/helpers/text.test.php              | 4 ++--
 cake/tests/cases/libs/view/helpers/time.test.php              | 4 ++--
 cake/tests/cases/libs/view/helpers/xml.test.php               | 4 ++--
 cake/tests/cases/libs/view/theme.test.php                     | 4 ++--
 cake/tests/cases/libs/view/view.test.php                      | 4 ++--
 cake/tests/cases/libs/xml.test.php                            | 4 ++--
 cake/tests/fixtures/account_fixture.php                       | 4 ++--
 cake/tests/fixtures/aco_action_fixture.php                    | 4 ++--
 cake/tests/fixtures/aco_fixture.php                           | 4 ++--
 cake/tests/fixtures/aco_two_fixture.php                       | 4 ++--
 cake/tests/fixtures/advertisement_fixture.php                 | 4 ++--
 cake/tests/fixtures/another_article_fixture.php               | 4 ++--
 cake/tests/fixtures/apple_fixture.php                         | 4 ++--
 cake/tests/fixtures/aro_fixture.php                           | 4 ++--
 cake/tests/fixtures/aro_two_fixture.php                       | 4 ++--
 cake/tests/fixtures/aros_aco_fixture.php                      | 4 ++--
 cake/tests/fixtures/aros_aco_two_fixture.php                  | 4 ++--
 cake/tests/fixtures/article_featured_fixture.php              | 4 ++--
 cake/tests/fixtures/article_featureds_tags_fixture.php        | 4 ++--
 cake/tests/fixtures/article_fixture.php                       | 4 ++--
 cake/tests/fixtures/articles_tag_fixture.php                  | 4 ++--
 cake/tests/fixtures/attachment_fixture.php                    | 4 ++--
 cake/tests/fixtures/auth_user_custom_field_fixture.php        | 4 ++--
 cake/tests/fixtures/auth_user_fixture.php                     | 4 ++--
 cake/tests/fixtures/author_fixture.php                        | 4 ++--
 cake/tests/fixtures/basket_fixture.php                        | 4 ++--
 cake/tests/fixtures/bid_fixture.php                           | 4 ++--
 cake/tests/fixtures/binary_test_fixture.php                   | 4 ++--
 cake/tests/fixtures/book_fixture.php                          | 4 ++--
 cake/tests/fixtures/cache_test_model_fixture.php              | 4 ++--
 cake/tests/fixtures/callback_fixture.php                      | 4 ++--
 cake/tests/fixtures/category_fixture.php                      | 4 ++--
 cake/tests/fixtures/category_thread_fixture.php               | 4 ++--
 cake/tests/fixtures/cd_fixture.php                            | 4 ++--
 cake/tests/fixtures/comment_fixture.php                       | 4 ++--
 cake/tests/fixtures/content_account_fixture.php               | 4 ++--
 cake/tests/fixtures/content_fixture.php                       | 4 ++--
 cake/tests/fixtures/counter_cache_post_fixture.php            | 4 ++--
 .../counter_cache_post_nonstandard_primary_key_fixture.php    | 4 ++--
 cake/tests/fixtures/counter_cache_user_fixture.php            | 4 ++--
 .../counter_cache_user_nonstandard_primary_key_fixture.php    | 4 ++--
 cake/tests/fixtures/data_test_fixture.php                     | 4 ++--
 cake/tests/fixtures/datatype_fixture.php                      | 4 ++--
 cake/tests/fixtures/dependency_fixture.php                    | 4 ++--
 cake/tests/fixtures/device_fixture.php                        | 4 ++--
 cake/tests/fixtures/device_type_category_fixture.php          | 4 ++--
 cake/tests/fixtures/device_type_fixture.php                   | 4 ++--
 cake/tests/fixtures/document_directory_fixture.php            | 4 ++--
 cake/tests/fixtures/document_fixture.php                      | 4 ++--
 cake/tests/fixtures/exterior_type_category_fixture.php        | 4 ++--
 cake/tests/fixtures/feature_set_fixture.php                   | 4 ++--
 cake/tests/fixtures/featured_fixture.php                      | 4 ++--
 cake/tests/fixtures/film_file_fixture.php                     | 4 ++--
 cake/tests/fixtures/flag_tree_fixture.php                     | 4 ++--
 cake/tests/fixtures/fruit_fixture.php                         | 4 ++--
 cake/tests/fixtures/fruits_uuid_tag_fixture.php               | 4 ++--
 cake/tests/fixtures/home_fixture.php                          | 4 ++--
 cake/tests/fixtures/image_fixture.php                         | 4 ++--
 cake/tests/fixtures/item_fixture.php                          | 4 ++--
 cake/tests/fixtures/items_portfolio_fixture.php               | 4 ++--
 cake/tests/fixtures/join_a_b_fixture.php                      | 4 ++--
 cake/tests/fixtures/join_a_c_fixture.php                      | 4 ++--
 cake/tests/fixtures/join_a_fixture.php                        | 4 ++--
 cake/tests/fixtures/join_b_fixture.php                        | 4 ++--
 cake/tests/fixtures/join_c_fixture.php                        | 4 ++--
 cake/tests/fixtures/join_thing_fixture.php                    | 4 ++--
 cake/tests/fixtures/message_fixture.php                       | 4 ++--
 cake/tests/fixtures/my_categories_my_products_fixture.php     | 4 ++--
 cake/tests/fixtures/my_categories_my_users_fixture.php        | 4 ++--
 cake/tests/fixtures/my_category_fixture.php                   | 4 ++--
 cake/tests/fixtures/my_product_fixture.php                    | 4 ++--
 cake/tests/fixtures/my_user_fixture.php                       | 4 ++--
 cake/tests/fixtures/node_fixture.php                          | 4 ++--
 cake/tests/fixtures/number_tree_fixture.php                   | 4 ++--
 cake/tests/fixtures/number_tree_two_fixture.php               | 4 ++--
 cake/tests/fixtures/numeric_article_fixture.php               | 4 ++--
 cake/tests/fixtures/overall_favorite_fixture.php              | 4 ++--
 cake/tests/fixtures/person_fixture.php                        | 4 ++--
 cake/tests/fixtures/portfolio_fixture.php                     | 4 ++--
 cake/tests/fixtures/post_fixture.php                          | 4 ++--
 cake/tests/fixtures/posts_tag_fixture.php                     | 4 ++--
 cake/tests/fixtures/primary_model_fixture.php                 | 4 ++--
 cake/tests/fixtures/product_fixture.php                       | 4 ++--
 cake/tests/fixtures/project_fixture.php                       | 4 ++--
 cake/tests/fixtures/sample_fixture.php                        | 4 ++--
 cake/tests/fixtures/secondary_model_fixture.php               | 4 ++--
 cake/tests/fixtures/session_fixture.php                       | 4 ++--
 cake/tests/fixtures/something_else_fixture.php                | 4 ++--
 cake/tests/fixtures/something_fixture.php                     | 4 ++--
 cake/tests/fixtures/stories_tag_fixture.php                   | 4 ++--
 cake/tests/fixtures/story_fixture.php                         | 4 ++--
 cake/tests/fixtures/syfile_fixture.php                        | 4 ++--
 cake/tests/fixtures/tag_fixture.php                           | 4 ++--
 cake/tests/fixtures/test_plugin_article_fixture.php           | 4 ++--
 cake/tests/fixtures/test_plugin_comment_fixture.php           | 4 ++--
 cake/tests/fixtures/the_paper_monkies_fixture.php             | 4 ++--
 cake/tests/fixtures/thread_fixture.php                        | 4 ++--
 cake/tests/fixtures/translate_article_fixture.php             | 4 ++--
 cake/tests/fixtures/translate_fixture.php                     | 4 ++--
 cake/tests/fixtures/translate_table_fixture.php               | 4 ++--
 cake/tests/fixtures/translated_article_fixture.php            | 4 ++--
 cake/tests/fixtures/translated_item_fixture.php               | 4 ++--
 cake/tests/fixtures/unconventional_tree_fixture.php           | 4 ++--
 cake/tests/fixtures/underscore_field_fixture.php              | 4 ++--
 cake/tests/fixtures/user_fixture.php                          | 4 ++--
 cake/tests/fixtures/uuid_fixture.php                          | 4 ++--
 cake/tests/fixtures/uuid_tag_fixture.php                      | 4 ++--
 cake/tests/fixtures/uuid_tree_fixture.php                     | 4 ++--
 cake/tests/fixtures/uuiditem_fixture.php                      | 4 ++--
 cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php       | 4 ++--
 .../fixtures/uuiditems_uuidportfolio_numericid_fixture.php    | 4 ++--
 cake/tests/fixtures/uuidportfolio_fixture.php                 | 4 ++--
 cake/tests/groups/acl.group.php                               | 4 ++--
 cake/tests/groups/cache.group.php                             | 4 ++--
 cake/tests/groups/components.group.php                        | 4 ++--
 cake/tests/groups/configure.group.php                         | 4 ++--
 cake/tests/groups/console.group.php                           | 4 ++--
 cake/tests/groups/controller.group.php                        | 4 ++--
 cake/tests/groups/database.group.php                          | 4 ++--
 cake/tests/groups/helpers.group.php                           | 4 ++--
 cake/tests/groups/lib.group.php                               | 4 ++--
 cake/tests/groups/model.group.php                             | 4 ++--
 cake/tests/groups/no_cross_contamination.group.php            | 4 ++--
 cake/tests/groups/routing_system.group.php                    | 4 ++--
 cake/tests/groups/socket.group.php                            | 4 ++--
 cake/tests/groups/test_suite.group.php                        | 4 ++--
 cake/tests/groups/view.group.php                              | 4 ++--
 cake/tests/groups/xml.group.php                               | 4 ++--
 cake/tests/lib/cake_reporter.php                              | 4 ++--
 cake/tests/lib/cake_test_case.php                             | 4 ++--
 cake/tests/lib/cake_test_fixture.php                          | 4 ++--
 cake/tests/lib/cake_test_model.php                            | 4 ++--
 cake/tests/lib/cake_web_test_case.php                         | 4 ++--
 cake/tests/lib/cli_reporter.php                               | 4 ++--
 cake/tests/lib/code_coverage_manager.php                      | 4 ++--
 cake/tests/lib/content.php                                    | 4 ++--
 cake/tests/lib/footer.php                                     | 4 ++--
 cake/tests/lib/header.php                                     | 4 ++--
 cake/tests/lib/simpletest.php                                 | 4 ++--
 cake/tests/lib/test_manager.php                               | 4 ++--
 cake/tests/lib/xdebug.php                                     | 4 ++--
 cake/tests/test_app/config/acl.ini.php                        | 4 ++--
 cake/tests/test_app/controllers/tests_apps_controller.php     | 4 ++--
 .../test_app/controllers/tests_apps_posts_controller.php      | 4 ++--
 .../test_app/models/behaviors/persister_one_behavior.php      | 4 ++--
 .../test_app/models/behaviors/persister_two_behavior.php      | 4 ++--
 cake/tests/test_app/models/comment.php                        | 4 ++--
 cake/tests/test_app/models/persister_one.php                  | 4 ++--
 cake/tests/test_app/models/persister_two.php                  | 4 ++--
 cake/tests/test_app/models/post.php                           | 4 ++--
 .../test_plugin/controllers/components/other_component.php    | 4 ++--
 .../test_plugin/controllers/components/plugins_component.php  | 4 ++--
 .../controllers/components/test_plugin_component.php          | 4 ++--
 .../controllers/components/test_plugin_other_component.php    | 4 ++--
 .../plugins/test_plugin/controllers/tests_controller.php      | 4 ++--
 .../models/behaviors/test_plugin_persister_one.php            | 4 ++--
 .../models/behaviors/test_plugin_persister_two.php            | 4 ++--
 .../test_app/plugins/test_plugin/models/test_plugin_post.php  | 4 ++--
 .../plugins/test_plugin/test_plugin_app_controller.php        | 4 ++--
 .../test_app/plugins/test_plugin/test_plugin_app_model.php    | 4 ++--
 .../plugins/test_plugin/vendors/sample/sample_plugin.php      | 4 ++--
 .../test_app/plugins/test_plugin/vendors/shells/example.php   | 4 ++--
 cake/tests/test_app/plugins/test_plugin/vendors/welcome.php   | 4 ++--
 .../plugins/test_plugin/views/helpers/other_helper.php        | 4 ++--
 .../plugins/test_plugin/views/helpers/plugged_helper.php      | 4 ++--
 .../plugins/test_plugin_two/vendors/shells/example.php        | 4 ++--
 .../plugins/test_plugin_two/vendors/shells/welcome.php        | 4 ++--
 cake/tests/test_app/vendors/Test/MyTest.php                   | 4 ++--
 cake/tests/test_app/vendors/Test/hello.php                    | 4 ++--
 .../test_app/vendors/sample/configure_test_vendor_sample.php  | 4 ++--
 cake/tests/test_app/vendors/shells/sample.php                 | 4 ++--
 cake/tests/test_app/vendors/somename/some.name.php            | 4 ++--
 cake/tests/test_app/vendors/welcome.php                       | 4 ++--
 cake/tests/test_app/views/elements/email/html/default.ctp     | 4 ++--
 cake/tests/test_app/views/elements/email/text/default.ctp     | 4 ++--
 cake/tests/test_app/views/elements/email/text/wide.ctp        | 4 ++--
 cake/tests/test_app/views/layouts/ajax.ctp                    | 4 ++--
 cake/tests/test_app/views/layouts/ajax2.ctp                   | 4 ++--
 cake/tests/test_app/views/layouts/cache_layout.ctp            | 4 ++--
 cake/tests/test_app/views/layouts/default.ctp                 | 4 ++--
 cake/tests/test_app/views/layouts/email/html/default.ctp      | 4 ++--
 cake/tests/test_app/views/layouts/email/html/thin.ctp         | 4 ++--
 cake/tests/test_app/views/layouts/email/text/default.ctp      | 4 ++--
 cake/tests/test_app/views/layouts/flash.ctp                   | 4 ++--
 cake/tests/test_app/views/layouts/multi_cache.ctp             | 4 ++--
 cake/tests/test_app/views/posts/sequencial_nocache.ctp        | 4 ++--
 cake/tests/test_app/views/posts/test_nocache_tags.ctp         | 4 ++--
 index.php                                                     | 4 ++--
 481 files changed, 954 insertions(+), 954 deletions(-)

diff --git a/app/config/acl.ini.php b/app/config/acl.ini.php
index a9868e685..c0e3a9b7a 100644
--- a/app/config/acl.ini.php
+++ b/app/config/acl.ini.php
@@ -7,13 +7,13 @@
 ; * PHP versions 4 and 5
 ; *
 ; * CakePHP(tm) :  Rapid Development Framework http://www.cakephp.org/
-; * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+; * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
 ; *
 ; *  Licensed under The MIT License
 ; *  Redistributions of files must retain the above copyright notice.
 ; *
 ; * @filesource
-; * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
 ; * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
 ; * @package       cake
 ; * @subpackage    cake.app.config
diff --git a/app/config/bootstrap.php b/app/config/bootstrap.php
index b817172c7..bede17125 100644
--- a/app/config/bootstrap.php
+++ b/app/config/bootstrap.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
diff --git a/app/config/core.php b/app/config/core.php
index 672a00e91..7e078fc96 100644
--- a/app/config/core.php
+++ b/app/config/core.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
diff --git a/app/config/database.php.default b/app/config/database.php.default
index 5c20804d4..ac3e99dfe 100644
--- a/app/config/database.php.default
+++ b/app/config/database.php.default
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
diff --git a/app/config/inflections.php b/app/config/inflections.php
index 07ca6d2a8..ccbb0e793 100644
--- a/app/config/inflections.php
+++ b/app/config/inflections.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and %
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
diff --git a/app/config/routes.php b/app/config/routes.php
index b14e435c3..1bec77b10 100644
--- a/app/config/routes.php
+++ b/app/config/routes.php
@@ -10,13 +10,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
diff --git a/app/config/sql/db_acl.php b/app/config/sql/db_acl.php
index 19434d0c6..dd6a1ac1b 100644
--- a/app/config/sql/db_acl.php
+++ b/app/config/sql/db_acl.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config.sql
diff --git a/app/config/sql/db_acl.sql b/app/config/sql/db_acl.sql
index 6fc01b8ea..17707caab 100644
--- a/app/config/sql/db_acl.sql
+++ b/app/config/sql/db_acl.sql
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright 2005-2008,	Cake Software Foundation, Inc.
+# Copyright 2005-2010,	Cake Software Foundation, Inc.
 #
 # Licensed under The MIT License
 # Redistributions of files must retain the above copyright notice.
diff --git a/app/config/sql/i18n.php b/app/config/sql/i18n.php
index b8158dd5a..40c2957fe 100644
--- a/app/config/sql/i18n.php
+++ b/app/config/sql/i18n.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config.sql
diff --git a/app/config/sql/i18n.sql b/app/config/sql/i18n.sql
index db1daea4a..909f79c5e 100644
--- a/app/config/sql/i18n.sql
+++ b/app/config/sql/i18n.sql
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright 2005-2008,	Cake Software Foundation, Inc.
+# Copyright 2005-2010,	Cake Software Foundation, Inc.
 #
 # Licensed under The MIT License
 # Redistributions of files must retain the above copyright notice.
diff --git a/app/config/sql/sessions.php b/app/config/sql/sessions.php
index 197366108..334c0b9ce 100644
--- a/app/config/sql/sessions.php
+++ b/app/config/sql/sessions.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config.sql
diff --git a/app/config/sql/sessions.sql b/app/config/sql/sessions.sql
index 75be419a1..1564ae1d5 100644
--- a/app/config/sql/sessions.sql
+++ b/app/config/sql/sessions.sql
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright 2005-2008,	Cake Software Foundation, Inc.
+# Copyright 2005-2010,	Cake Software Foundation, Inc.
 #								1785 E. Sahara Avenue, Suite 490-204
 #								Las Vegas, Nevada 89104
 #
diff --git a/app/index.php b/app/index.php
index 5724a1c4b..057c1af3a 100644
--- a/app/index.php
+++ b/app/index.php
@@ -4,13 +4,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app
diff --git a/app/webroot/css.php b/app/webroot/css.php
index 969dd0e27..15dba4ae8 100644
--- a/app/webroot/css.php
+++ b/app/webroot/css.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot
diff --git a/app/webroot/css/cake.generic.css b/app/webroot/css/cake.generic.css
index ab3e1321c..13df20602 100644
--- a/app/webroot/css/cake.generic.css
+++ b/app/webroot/css/cake.generic.css
@@ -4,13 +4,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot.css
diff --git a/app/webroot/index.php b/app/webroot/index.php
index 34837799b..9d2113576 100644
--- a/app/webroot/index.php
+++ b/app/webroot/index.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot
diff --git a/app/webroot/js/vendors.php b/app/webroot/js/vendors.php
index 5fda0b7b4..5c6181290 100644
--- a/app/webroot/js/vendors.php
+++ b/app/webroot/js/vendors.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot.js
diff --git a/app/webroot/test.php b/app/webroot/test.php
index a57d15747..665def442 100644
--- a/app/webroot/test.php
+++ b/app/webroot/test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/LICENSE.txt b/cake/LICENSE.txt
index e54a5572b..d699c53c7 100644
--- a/cake/LICENSE.txt
+++ b/cake/LICENSE.txt
@@ -1,7 +1,7 @@
 The MIT License
 
 CakePHP(tm) : The Rapid Development PHP Framework (http://www.cakephp.org)
-Copyright 2005-2007, Cake Software Foundation, Inc.
+Copyright 2005-2010, Cake Software Foundation, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/cake/basics.php b/cake/basics.php
index 0659d28ec..530dd2252 100644
--- a/cake/basics.php
+++ b/cake/basics.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake
diff --git a/cake/bootstrap.php b/cake/bootstrap.php
index f9aa7b438..1652b085f 100644
--- a/cake/bootstrap.php
+++ b/cake/bootstrap.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake
diff --git a/cake/config/config.php b/cake/config/config.php
index baecc26de..7029f3eb7 100644
--- a/cake/config/config.php
+++ b/cake/config/config.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
diff --git a/cake/config/paths.php b/cake/config/paths.php
index 6a6449f0e..727b36cca 100644
--- a/cake/config/paths.php
+++ b/cake/config/paths.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.app.config
diff --git a/cake/config/unicode/casefolding/0080_00ff.php b/cake/config/unicode/casefolding/0080_00ff.php
index 361b9f4ce..730c97086 100644
--- a/cake/config/unicode/casefolding/0080_00ff.php
+++ b/cake/config/unicode/casefolding/0080_00ff.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/0100_017f.php b/cake/config/unicode/casefolding/0100_017f.php
index 4f27b2b08..aa092f719 100644
--- a/cake/config/unicode/casefolding/0100_017f.php
+++ b/cake/config/unicode/casefolding/0100_017f.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/0180_024F.php b/cake/config/unicode/casefolding/0180_024F.php
index c3d60326e..948eb8906 100644
--- a/cake/config/unicode/casefolding/0180_024F.php
+++ b/cake/config/unicode/casefolding/0180_024F.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/0250_02af.php b/cake/config/unicode/casefolding/0250_02af.php
index 31d9b912d..62cf773af 100644
--- a/cake/config/unicode/casefolding/0250_02af.php
+++ b/cake/config/unicode/casefolding/0250_02af.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/0370_03ff.php b/cake/config/unicode/casefolding/0370_03ff.php
index 776667a88..c088320ef 100644
--- a/cake/config/unicode/casefolding/0370_03ff.php
+++ b/cake/config/unicode/casefolding/0370_03ff.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/0400_04ff.php b/cake/config/unicode/casefolding/0400_04ff.php
index 6e1f6e9a8..3e3cf8d98 100644
--- a/cake/config/unicode/casefolding/0400_04ff.php
+++ b/cake/config/unicode/casefolding/0400_04ff.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/0500_052f.php b/cake/config/unicode/casefolding/0500_052f.php
index 17853593e..1e5449ec5 100644
--- a/cake/config/unicode/casefolding/0500_052f.php
+++ b/cake/config/unicode/casefolding/0500_052f.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/0530_058f.php b/cake/config/unicode/casefolding/0530_058f.php
index 83000a12f..599b8516c 100644
--- a/cake/config/unicode/casefolding/0530_058f.php
+++ b/cake/config/unicode/casefolding/0530_058f.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/1e00_1eff.php b/cake/config/unicode/casefolding/1e00_1eff.php
index b8ad76f65..cdd24c36f 100644
--- a/cake/config/unicode/casefolding/1e00_1eff.php
+++ b/cake/config/unicode/casefolding/1e00_1eff.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/1f00_1fff.php b/cake/config/unicode/casefolding/1f00_1fff.php
index 2e758924c..39bebc63b 100644
--- a/cake/config/unicode/casefolding/1f00_1fff.php
+++ b/cake/config/unicode/casefolding/1f00_1fff.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/2100_214f.php b/cake/config/unicode/casefolding/2100_214f.php
index 42bf20709..eb801c35c 100644
--- a/cake/config/unicode/casefolding/2100_214f.php
+++ b/cake/config/unicode/casefolding/2100_214f.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/2150_218f.php b/cake/config/unicode/casefolding/2150_218f.php
index ac4f9d154..dcff6df50 100644
--- a/cake/config/unicode/casefolding/2150_218f.php
+++ b/cake/config/unicode/casefolding/2150_218f.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/2460_24ff.php b/cake/config/unicode/casefolding/2460_24ff.php
index 9efd3916f..e7e675373 100644
--- a/cake/config/unicode/casefolding/2460_24ff.php
+++ b/cake/config/unicode/casefolding/2460_24ff.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/2c00_2c5f.php b/cake/config/unicode/casefolding/2c00_2c5f.php
index 0b00aa577..e27abdf82 100644
--- a/cake/config/unicode/casefolding/2c00_2c5f.php
+++ b/cake/config/unicode/casefolding/2c00_2c5f.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/2c60_2c7f.php b/cake/config/unicode/casefolding/2c60_2c7f.php
index 91dc2e47e..3d3553a52 100644
--- a/cake/config/unicode/casefolding/2c60_2c7f.php
+++ b/cake/config/unicode/casefolding/2c60_2c7f.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/2c80_2cff.php b/cake/config/unicode/casefolding/2c80_2cff.php
index 8f07be272..df9879c55 100644
--- a/cake/config/unicode/casefolding/2c80_2cff.php
+++ b/cake/config/unicode/casefolding/2c80_2cff.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/config/unicode/casefolding/ff00_ffef.php b/cake/config/unicode/casefolding/ff00_ffef.php
index ddcd35e46..530f0e75c 100644
--- a/cake/config/unicode/casefolding/ff00_ffef.php
+++ b/cake/config/unicode/casefolding/ff00_ffef.php
@@ -12,13 +12,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
diff --git a/cake/console/cake b/cake/console/cake
index 1257251d6..0edff7e8f 100755
--- a/cake/console/cake
+++ b/cake/console/cake
@@ -5,13 +5,13 @@
 # PHP versions 4 and 5
 #
 # CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
-# Copyright 2005-2007, Cake Software Foundation, Inc.
+# Copyright 2005-2010, Cake Software Foundation, Inc.
 #
 # Licensed under The MIT License
 # Redistributions of files must retain the above copyright notice.
 #
 # @filesource
-# @copyright		Copyright 2005-2007, Cake Software Foundation, Inc.
+# @copyright		Copyright 2005-2010, Cake Software Foundation, Inc.
 # @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
 # @package			cake
 # @subpackage		cake.cake.console
diff --git a/cake/console/cake.bat b/cake/console/cake.bat
index c0a531c8e..35c1a2b83 100644
--- a/cake/console/cake.bat
+++ b/cake/console/cake.bat
@@ -4,13 +4,13 @@
 :: PHP versions 4 and 5
 ::
 :: CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
-:: Copyright 2005-2007, Cake Software Foundation, Inc.
+:: Copyright 2005-2010, Cake Software Foundation, Inc.
 ::
 :: Licensed under The MIT License
 :: Redistributions of files must retain the above copyright notice.
 ::
 :: @filesource
-:: @copyright		Copyright 2005-2007, Cake Software Foundation, Inc.
+:: @copyright		Copyright 2005-2010, Cake Software Foundation, Inc.
 :: @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
 :: @package			cake
 :: @subpackage		cake.cake.console
diff --git a/cake/console/cake.php b/cake/console/cake.php
index cfd118302..e90f7e555 100644
--- a/cake/console/cake.php
+++ b/cake/console/cake.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008,	Cake Software Foundation, Inc.
+ * Copyright 2005-2010,	Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console
diff --git a/cake/console/error.php b/cake/console/error.php
index 9c88a40b8..788fe3611 100644
--- a/cake/console/error.php
+++ b/cake/console/error.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console
diff --git a/cake/console/libs/acl.php b/cake/console/libs/acl.php
index 15b678404..f7d8c4ae1 100644
--- a/cake/console/libs/acl.php
+++ b/cake/console/libs/acl.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
diff --git a/cake/console/libs/api.php b/cake/console/libs/api.php
index c370d7310..b3a34755f 100644
--- a/cake/console/libs/api.php
+++ b/cake/console/libs/api.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
diff --git a/cake/console/libs/bake.php b/cake/console/libs/bake.php
index f891ca2a4..a80cf775e 100644
--- a/cake/console/libs/bake.php
+++ b/cake/console/libs/bake.php
@@ -10,13 +10,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
diff --git a/cake/console/libs/console.php b/cake/console/libs/console.php
index 189da32e8..bf075c21b 100644
--- a/cake/console/libs/console.php
+++ b/cake/console/libs/console.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
diff --git a/cake/console/libs/i18n.php b/cake/console/libs/i18n.php
index f0e23b91b..70ffd61b3 100644
--- a/cake/console/libs/i18n.php
+++ b/cake/console/libs/i18n.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
diff --git a/cake/console/libs/schema.php b/cake/console/libs/schema.php
index 36974eb51..c7cf5cfcf 100644
--- a/cake/console/libs/schema.php
+++ b/cake/console/libs/schema.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php
index 4ca89a3c4..8f5c7a6eb 100644
--- a/cake/console/libs/shell.php
+++ b/cake/console/libs/shell.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index d4ab58abe..74bc89213 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008,	Cake Software Foundation, Inc.
+ * Copyright 2005-2010,	Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
diff --git a/cake/console/libs/tasks/db_config.php b/cake/console/libs/tasks/db_config.php
index 3126c00d9..e0844a5d9 100644
--- a/cake/console/libs/tasks/db_config.php
+++ b/cake/console/libs/tasks/db_config.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
diff --git a/cake/console/libs/tasks/extract.php b/cake/console/libs/tasks/extract.php
index a956afd4d..6bb5a27ff 100644
--- a/cake/console/libs/tasks/extract.php
+++ b/cake/console/libs/tasks/extract.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index 654911932..fac911605 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
diff --git a/cake/console/libs/tasks/plugin.php b/cake/console/libs/tasks/plugin.php
index a23181322..34bc1b4ed 100644
--- a/cake/console/libs/tasks/plugin.php
+++ b/cake/console/libs/tasks/plugin.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php
index f7a0c3021..e2836daef 100644
--- a/cake/console/libs/tasks/project.php
+++ b/cake/console/libs/tasks/project.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.scripts.bake
diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php
index 416d3bd22..aa71bdb15 100644
--- a/cake/console/libs/tasks/test.php
+++ b/cake/console/libs/tasks/test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php
index cd60df611..d15b5f243 100644
--- a/cake/console/libs/tasks/view.php
+++ b/cake/console/libs/tasks/view.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
diff --git a/cake/console/libs/templates/skel/app_controller.php b/cake/console/libs/templates/skel/app_controller.php
index 2412447bc..6c38cbe90 100644
--- a/cake/console/libs/templates/skel/app_controller.php
+++ b/cake/console/libs/templates/skel/app_controller.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app
diff --git a/cake/console/libs/templates/skel/app_helper.php b/cake/console/libs/templates/skel/app_helper.php
index c57f438b8..3b751a8b4 100644
--- a/cake/console/libs/templates/skel/app_helper.php
+++ b/cake/console/libs/templates/skel/app_helper.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake
diff --git a/cake/console/libs/templates/skel/app_model.php b/cake/console/libs/templates/skel/app_model.php
index 80938823f..b1fcdc75a 100644
--- a/cake/console/libs/templates/skel/app_model.php
+++ b/cake/console/libs/templates/skel/app_model.php
@@ -10,13 +10,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app
diff --git a/cake/console/libs/templates/skel/config/acl.ini.php b/cake/console/libs/templates/skel/config/acl.ini.php
index ee585c27a..23ba4d25f 100644
--- a/cake/console/libs/templates/skel/config/acl.ini.php
+++ b/cake/console/libs/templates/skel/config/acl.ini.php
@@ -7,13 +7,13 @@
 ; * PHP versions 4 and 5
 ; *
 ; * CakePHP(tm) :  Rapid Development Framework http://www.cakephp.org/
-; * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+; * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
 ; *
 ; *  Licensed under The MIT License
 ; *  Redistributions of files must retain the above copyright notice.
 ; *
 ; * @filesource
-; * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
 ; * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
 ; * @package       cake
 ; * @subpackage    cake.app.config
diff --git a/cake/console/libs/templates/skel/config/bootstrap.php b/cake/console/libs/templates/skel/config/bootstrap.php
index b817172c7..bede17125 100644
--- a/cake/console/libs/templates/skel/config/bootstrap.php
+++ b/cake/console/libs/templates/skel/config/bootstrap.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
diff --git a/cake/console/libs/templates/skel/config/core.php b/cake/console/libs/templates/skel/config/core.php
index fbd02e74a..bbc34d0f8 100644
--- a/cake/console/libs/templates/skel/config/core.php
+++ b/cake/console/libs/templates/skel/config/core.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
diff --git a/cake/console/libs/templates/skel/config/database.php.default b/cake/console/libs/templates/skel/config/database.php.default
index 5c20804d4..ac3e99dfe 100644
--- a/cake/console/libs/templates/skel/config/database.php.default
+++ b/cake/console/libs/templates/skel/config/database.php.default
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
diff --git a/cake/console/libs/templates/skel/config/inflections.php b/cake/console/libs/templates/skel/config/inflections.php
index ed8c08b3d..467b09c66 100644
--- a/cake/console/libs/templates/skel/config/inflections.php
+++ b/cake/console/libs/templates/skel/config/inflections.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and %
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
diff --git a/cake/console/libs/templates/skel/config/routes.php b/cake/console/libs/templates/skel/config/routes.php
index b14e435c3..1bec77b10 100644
--- a/cake/console/libs/templates/skel/config/routes.php
+++ b/cake/console/libs/templates/skel/config/routes.php
@@ -10,13 +10,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
diff --git a/cake/console/libs/templates/skel/config/sql/db_acl.php b/cake/console/libs/templates/skel/config/sql/db_acl.php
index 19434d0c6..dd6a1ac1b 100644
--- a/cake/console/libs/templates/skel/config/sql/db_acl.php
+++ b/cake/console/libs/templates/skel/config/sql/db_acl.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config.sql
diff --git a/cake/console/libs/templates/skel/config/sql/db_acl.sql b/cake/console/libs/templates/skel/config/sql/db_acl.sql
index 3b8089bc3..d0e3298c0 100644
--- a/cake/console/libs/templates/skel/config/sql/db_acl.sql
+++ b/cake/console/libs/templates/skel/config/sql/db_acl.sql
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright 2005-2008,	Cake Software Foundation, Inc.
+# Copyright 2005-2010,	Cake Software Foundation, Inc.
 #
 # Licensed under The MIT License
 # Redistributions of files must retain the above copyright notice.
diff --git a/cake/console/libs/templates/skel/config/sql/i18n.php b/cake/console/libs/templates/skel/config/sql/i18n.php
index b8158dd5a..40c2957fe 100644
--- a/cake/console/libs/templates/skel/config/sql/i18n.php
+++ b/cake/console/libs/templates/skel/config/sql/i18n.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config.sql
diff --git a/cake/console/libs/templates/skel/config/sql/i18n.sql b/cake/console/libs/templates/skel/config/sql/i18n.sql
index 7629b609a..4c71d05e5 100644
--- a/cake/console/libs/templates/skel/config/sql/i18n.sql
+++ b/cake/console/libs/templates/skel/config/sql/i18n.sql
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright 2005-2008,	Cake Software Foundation, Inc.
+# Copyright 2005-2010,	Cake Software Foundation, Inc.
 #
 # Licensed under The MIT License
 # Redistributions of files must retain the above copyright notice.
diff --git a/cake/console/libs/templates/skel/config/sql/sessions.php b/cake/console/libs/templates/skel/config/sql/sessions.php
index 197366108..334c0b9ce 100644
--- a/cake/console/libs/templates/skel/config/sql/sessions.php
+++ b/cake/console/libs/templates/skel/config/sql/sessions.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config.sql
diff --git a/cake/console/libs/templates/skel/config/sql/sessions.sql b/cake/console/libs/templates/skel/config/sql/sessions.sql
index 75be419a1..1564ae1d5 100644
--- a/cake/console/libs/templates/skel/config/sql/sessions.sql
+++ b/cake/console/libs/templates/skel/config/sql/sessions.sql
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright 2005-2008,	Cake Software Foundation, Inc.
+# Copyright 2005-2010,	Cake Software Foundation, Inc.
 #								1785 E. Sahara Avenue, Suite 490-204
 #								Las Vegas, Nevada 89104
 #
diff --git a/cake/console/libs/templates/skel/controllers/pages_controller.php b/cake/console/libs/templates/skel/controllers/pages_controller.php
index 7013b6e17..ecbb51388 100644
--- a/cake/console/libs/templates/skel/controllers/pages_controller.php
+++ b/cake/console/libs/templates/skel/controllers/pages_controller.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller
diff --git a/cake/console/libs/templates/skel/index.php b/cake/console/libs/templates/skel/index.php
index 5724a1c4b..057c1af3a 100644
--- a/cake/console/libs/templates/skel/index.php
+++ b/cake/console/libs/templates/skel/index.php
@@ -4,13 +4,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app
diff --git a/cake/console/libs/templates/skel/views/elements/email/html/default.ctp b/cake/console/libs/templates/skel/views/elements/email/html/default.ctp
index 6e51c0fd4..49a085a29 100644
--- a/cake/console/libs/templates/skel/views/elements/email/html/default.ctp
+++ b/cake/console/libs/templates/skel/views/elements/email/html/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements.email.html
diff --git a/cake/console/libs/templates/skel/views/elements/email/text/default.ctp b/cake/console/libs/templates/skel/views/elements/email/text/default.ctp
index cbb261c64..284acea16 100644
--- a/cake/console/libs/templates/skel/views/elements/email/text/default.ctp
+++ b/cake/console/libs/templates/skel/views/elements/email/text/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements.email.text
diff --git a/cake/console/libs/templates/skel/views/layouts/ajax.ctp b/cake/console/libs/templates/skel/views/layouts/ajax.ctp
index ca3459af8..e6bd065e0 100644
--- a/cake/console/libs/templates/skel/views/layouts/ajax.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/ajax.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
diff --git a/cake/console/libs/templates/skel/views/layouts/default.ctp b/cake/console/libs/templates/skel/views/layouts/default.ctp
index 8cc346713..589f4f447 100644
--- a/cake/console/libs/templates/skel/views/layouts/default.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.templates.skel.views.layouts
diff --git a/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp b/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
index 1853a7b3a..63573ac05 100644
--- a/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts.email.html
diff --git a/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp b/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
index 77fda3bd6..9a0cf7835 100644
--- a/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts.email.text
diff --git a/cake/console/libs/templates/skel/views/layouts/flash.ctp b/cake/console/libs/templates/skel/views/layouts/flash.ctp
index ddd63085f..d02fa8571 100644
--- a/cake/console/libs/templates/skel/views/layouts/flash.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/flash.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
diff --git a/cake/console/libs/templates/skel/webroot/css.php b/cake/console/libs/templates/skel/webroot/css.php
index 8c5e9ab0a..e475508ee 100644
--- a/cake/console/libs/templates/skel/webroot/css.php
+++ b/cake/console/libs/templates/skel/webroot/css.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot
diff --git a/cake/console/libs/templates/skel/webroot/css/cake.generic.css b/cake/console/libs/templates/skel/webroot/css/cake.generic.css
index 4ba03cedd..29773b983 100644
--- a/cake/console/libs/templates/skel/webroot/css/cake.generic.css
+++ b/cake/console/libs/templates/skel/webroot/css/cake.generic.css
@@ -4,13 +4,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot.css
diff --git a/cake/console/libs/templates/skel/webroot/index.php b/cake/console/libs/templates/skel/webroot/index.php
index 01be9dd64..1a4d7ddef 100644
--- a/cake/console/libs/templates/skel/webroot/index.php
+++ b/cake/console/libs/templates/skel/webroot/index.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot
diff --git a/cake/console/libs/templates/skel/webroot/js/vendors.php b/cake/console/libs/templates/skel/webroot/js/vendors.php
index 5fda0b7b4..5c6181290 100644
--- a/cake/console/libs/templates/skel/webroot/js/vendors.php
+++ b/cake/console/libs/templates/skel/webroot/js/vendors.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot.js
diff --git a/cake/console/libs/templates/skel/webroot/test.php b/cake/console/libs/templates/skel/webroot/test.php
index 1d668947b..d0c4065a2 100644
--- a/cake/console/libs/templates/skel/webroot/test.php
+++ b/cake/console/libs/templates/skel/webroot/test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/console/libs/templates/views/form.ctp b/cake/console/libs/templates/views/form.ctp
index fda3eddc9..07fddcf0c 100644
--- a/cake/console/libs/templates/views/form.ctp
+++ b/cake/console/libs/templates/views/form.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.templates.views
diff --git a/cake/console/libs/templates/views/index.ctp b/cake/console/libs/templates/views/index.ctp
index 49c69dbab..fb089f9a3 100644
--- a/cake/console/libs/templates/views/index.ctp
+++ b/cake/console/libs/templates/views/index.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.templates.views
diff --git a/cake/console/libs/templates/views/view.ctp b/cake/console/libs/templates/views/view.ctp
index e390bb02e..1a9c73d2c 100644
--- a/cake/console/libs/templates/views/view.ctp
+++ b/cake/console/libs/templates/views/view.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.templates.views
diff --git a/cake/console/libs/testsuite.php b/cake/console/libs/testsuite.php
index b11a7ea11..03408ba8b 100644
--- a/cake/console/libs/testsuite.php
+++ b/cake/console/libs/testsuite.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.console.libs
diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index 69e6a3f31..7c241473c 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake
diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index aabd27951..ee39f42ca 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -7,13 +7,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/cache/apc.php b/cake/libs/cache/apc.php
index 8e2a781a5..dcba88221 100644
--- a/cake/libs/cache/apc.php
+++ b/cake/libs/cache/apc.php
@@ -7,13 +7,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.cache
diff --git a/cake/libs/cache/file.php b/cake/libs/cache/file.php
index abbd5a0e6..ab17230dc 100644
--- a/cake/libs/cache/file.php
+++ b/cake/libs/cache/file.php
@@ -7,13 +7,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.cache
diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php
index 4c87c10c2..b1f97b349 100644
--- a/cake/libs/cache/memcache.php
+++ b/cake/libs/cache/memcache.php
@@ -7,13 +7,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.cache
diff --git a/cake/libs/cache/xcache.php b/cake/libs/cache/xcache.php
index 1ed9b0b5a..211e46ddb 100644
--- a/cake/libs/cache/xcache.php
+++ b/cake/libs/cache/xcache.php
@@ -7,13 +7,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.cache
diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php
index da779b2af..852f8fcb5 100644
--- a/cake/libs/cake_log.php
+++ b/cake/libs/cake_log.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/class_registry.php b/cake/libs/class_registry.php
index 2f566b46c..07b3a0599 100644
--- a/cake/libs/class_registry.php
+++ b/cake/libs/class_registry.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 4f3388186..b9c2914de 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/controller/app_controller.php b/cake/libs/controller/app_controller.php
index e791fa9fc..d15e034d1 100644
--- a/cake/libs/controller/app_controller.php
+++ b/cake/libs/controller/app_controller.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller
diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php
index c40571cda..27dab4efe 100644
--- a/cake/libs/controller/component.php
+++ b/cake/libs/controller/component.php
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller
diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php
index 3501e0b63..5caceceaa 100644
--- a/cake/libs/controller/components/acl.php
+++ b/cake/libs/controller/components/acl.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
index 420305d57..abebeb0f5 100644
--- a/cake/libs/controller/components/auth.php
+++ b/cake/libs/controller/components/auth.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php
index f84770922..deaa2647a 100644
--- a/cake/libs/controller/components/cookie.php
+++ b/cake/libs/controller/components/cookie.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index 55b843958..6fa466cd7 100644
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php
index 2c61f82b2..e95b6bd79 100644
--- a/cake/libs/controller/components/request_handler.php
+++ b/cake/libs/controller/components/request_handler.php
@@ -8,13 +8,13 @@
  * should respond to the different needs of a handheld computer and a desktop machine.
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index 825292e20..52f0d3d9d 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
diff --git a/cake/libs/controller/components/session.php b/cake/libs/controller/components/session.php
index f5164d4a6..08b61cbca 100644
--- a/cake/libs/controller/components/session.php
+++ b/cake/libs/controller/components/session.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index f47a5eec5..253cfe4b6 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller
diff --git a/cake/libs/controller/pages_controller.php b/cake/libs/controller/pages_controller.php
index 7013b6e17..ecbb51388 100644
--- a/cake/libs/controller/pages_controller.php
+++ b/cake/libs/controller/pages_controller.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller
diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php
index 165e2b562..b2e1d93af 100644
--- a/cake/libs/controller/scaffold.php
+++ b/cake/libs/controller/scaffold.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller
diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php
index 873b8a23c..4afa34b01 100644
--- a/cake/libs/debugger.php
+++ b/cake/libs/debugger.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/error.php b/cake/libs/error.php
index e8db8276a..195dbf7d1 100644
--- a/cake/libs/error.php
+++ b/cake/libs/error.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/file.php b/cake/libs/file.php
index b57cb4c72..641f2e1e5 100644
--- a/cake/libs/file.php
+++ b/cake/libs/file.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/flay.php b/cake/libs/flay.php
index 7d33b4a5e..ec3c213b3 100644
--- a/cake/libs/flay.php
+++ b/cake/libs/flay.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/folder.php b/cake/libs/folder.php
index 54856531c..5f6154c96 100644
--- a/cake/libs/folder.php
+++ b/cake/libs/folder.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index da8bd0268..44e4dfc2b 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/i18n.php b/cake/libs/i18n.php
index 5b2be8db8..6eba0bae9 100644
--- a/cake/libs/i18n.php
+++ b/cake/libs/i18n.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index 05b03ce4e..2a94a84e1 100644
--- a/cake/libs/inflector.php
+++ b/cake/libs/inflector.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php
index 7000a808b..a0acb162d 100644
--- a/cake/libs/l10n.php
+++ b/cake/libs/l10n.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/magic_db.php b/cake/libs/magic_db.php
index 9d7d90bb2..37396618c 100644
--- a/cake/libs/magic_db.php
+++ b/cake/libs/magic_db.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/model/app_model.php b/cake/libs/model/app_model.php
index 120aa563c..a311329c8 100644
--- a/cake/libs/model/app_model.php
+++ b/cake/libs/model/app_model.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model
diff --git a/cake/libs/model/behavior.php b/cake/libs/model/behavior.php
index 0f994c2c9..368f2a18e 100644
--- a/cake/libs/model/behavior.php
+++ b/cake/libs/model/behavior.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model
diff --git a/cake/libs/model/behaviors/acl.php b/cake/libs/model/behaviors/acl.php
index 0b867a2ca..01de82dca 100644
--- a/cake/libs/model/behaviors/acl.php
+++ b/cake/libs/model/behaviors/acl.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.behaviors
diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php
index b5e8eadf9..52f519ac4 100644
--- a/cake/libs/model/behaviors/containable.php
+++ b/cake/libs/model/behaviors/containable.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
diff --git a/cake/libs/model/behaviors/translate.php b/cake/libs/model/behaviors/translate.php
index 7e959f50c..64011295b 100644
--- a/cake/libs/model/behaviors/translate.php
+++ b/cake/libs/model/behaviors/translate.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.behaviors
diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php
index fd4a89993..addd8c6c2 100644
--- a/cake/libs/model/behaviors/tree.php
+++ b/cake/libs/model/behaviors/tree.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.behaviors
diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php
index a0db47226..428a77e32 100644
--- a/cake/libs/model/connection_manager.php
+++ b/cake/libs/model/connection_manager.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model
diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php
index fa7b6632d..835ba3a1d 100644
--- a/cake/libs/model/datasources/datasource.php
+++ b/cake/libs/model/datasources/datasource.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources
diff --git a/cake/libs/model/datasources/dbo/dbo_adodb.php b/cake/libs/model/datasources/dbo/dbo_adodb.php
index 7feda9885..94badf16b 100644
--- a/cake/libs/model/datasources/dbo/dbo_adodb.php
+++ b/cake/libs/model/datasources/dbo/dbo_adodb.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
diff --git a/cake/libs/model/datasources/dbo/dbo_db2.php b/cake/libs/model/datasources/dbo/dbo_db2.php
index 0942dee85..100b28535 100644
--- a/cake/libs/model/datasources/dbo/dbo_db2.php
+++ b/cake/libs/model/datasources/dbo/dbo_db2.php
@@ -16,7 +16,7 @@
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
diff --git a/cake/libs/model/datasources/dbo/dbo_firebird.php b/cake/libs/model/datasources/dbo/dbo_firebird.php
index dc9cec15f..f1c29e5b9 100644
--- a/cake/libs/model/datasources/dbo/dbo_firebird.php
+++ b/cake/libs/model/datasources/dbo/dbo_firebird.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.dbo
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index df0eaa66c..18c138364 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index 741a8c072..94962a8b7 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index cb78e110d..cc506e5a2 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
diff --git a/cake/libs/model/datasources/dbo/dbo_odbc.php b/cake/libs/model/datasources/dbo/dbo_odbc.php
index c6af41d25..64ab17d51 100644
--- a/cake/libs/model/datasources/dbo/dbo_odbc.php
+++ b/cake/libs/model/datasources/dbo/dbo_odbc.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.dbo
diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
index 92c81e897..f74c18766 100644
--- a/cake/libs/model/datasources/dbo/dbo_oracle.php
+++ b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index 9dc21da27..e2c0d8ce3 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index 1423aadcf..dea7385bc 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
diff --git a/cake/libs/model/datasources/dbo/dbo_sybase.php b/cake/libs/model/datasources/dbo/dbo_sybase.php
index 45e8fd057..5e30bfe3b 100644
--- a/cake/libs/model/datasources/dbo/dbo_sybase.php
+++ b/cake/libs/model/datasources/dbo/dbo_sybase.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 444f0244a..5de4db2ee 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources
diff --git a/cake/libs/model/db_acl.php b/cake/libs/model/db_acl.php
index a2a943cf6..aae5f718d 100644
--- a/cake/libs/model/db_acl.php
+++ b/cake/libs/model/db_acl.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index c7fd52c6c..01b05c186 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -8,13 +8,13 @@
  * PHP versions 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model
diff --git a/cake/libs/model/schema.php b/cake/libs/model/schema.php
index d1a455290..5de4a5e84 100644
--- a/cake/libs/model/schema.php
+++ b/cake/libs/model/schema.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model
diff --git a/cake/libs/multibyte.php b/cake/libs/multibyte.php
index 1dfcd456b..74c884e95 100644
--- a/cake/libs/multibyte.php
+++ b/cake/libs/multibyte.php
@@ -7,13 +7,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/object.php b/cake/libs/object.php
index 61c0896cd..7a8ddfd33 100644
--- a/cake/libs/object.php
+++ b/cake/libs/object.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/overloadable.php b/cake/libs/overloadable.php
index a3b170a08..c58a4986b 100644
--- a/cake/libs/overloadable.php
+++ b/cake/libs/overloadable.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/overloadable_php4.php b/cake/libs/overloadable_php4.php
index b60411c53..1e0750a17 100644
--- a/cake/libs/overloadable_php4.php
+++ b/cake/libs/overloadable_php4.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/overloadable_php5.php b/cake/libs/overloadable_php5.php
index 906b6b378..d78a8ab91 100644
--- a/cake/libs/overloadable_php5.php
+++ b/cake/libs/overloadable_php5.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/router.php b/cake/libs/router.php
index d1d95ca08..dc22a29ef 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/sanitize.php b/cake/libs/sanitize.php
index 8ed84a455..d81ab567c 100644
--- a/cake/libs/sanitize.php
+++ b/cake/libs/sanitize.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/security.php b/cake/libs/security.php
index 15ec7c1bb..72b453a03 100644
--- a/cake/libs/security.php
+++ b/cake/libs/security.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/session.php b/cake/libs/session.php
index 005fe9b30..cc4d41524 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -11,13 +11,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/set.php b/cake/libs/set.php
index cb9990c07..8a83d3c7f 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/socket.php b/cake/libs/socket.php
index c5c945aa0..9308b0a2c 100644
--- a/cake/libs/socket.php
+++ b/cake/libs/socket.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/string.php b/cake/libs/string.php
index 286017bdb..279e84732 100644
--- a/cake/libs/string.php
+++ b/cake/libs/string.php
@@ -7,13 +7,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index 22a1d1f62..5939bfa06 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/libs/view/elements/dump.ctp b/cake/libs/view/elements/dump.ctp
index 54c59acf6..9b1f807a3 100644
--- a/cake/libs/view/elements/dump.ctp
+++ b/cake/libs/view/elements/dump.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements
diff --git a/cake/libs/view/elements/email/html/default.ctp b/cake/libs/view/elements/email/html/default.ctp
index 6e51c0fd4..49a085a29 100644
--- a/cake/libs/view/elements/email/html/default.ctp
+++ b/cake/libs/view/elements/email/html/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements.email.html
diff --git a/cake/libs/view/elements/email/text/default.ctp b/cake/libs/view/elements/email/text/default.ctp
index cbb261c64..284acea16 100644
--- a/cake/libs/view/elements/email/text/default.ctp
+++ b/cake/libs/view/elements/email/text/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements.email.text
diff --git a/cake/libs/view/errors/error404.ctp b/cake/libs/view/errors/error404.ctp
index b849db72f..aa6dcd9ab 100644
--- a/cake/libs/view/errors/error404.ctp
+++ b/cake/libs/view/errors/error404.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/errors/missing_action.ctp b/cake/libs/view/errors/missing_action.ctp
index 0de1c6cc3..00b65e886 100644
--- a/cake/libs/view/errors/missing_action.ctp
+++ b/cake/libs/view/errors/missing_action.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/errors/missing_component_class.ctp b/cake/libs/view/errors/missing_component_class.ctp
index ec154de02..7171c32c9 100644
--- a/cake/libs/view/errors/missing_component_class.ctp
+++ b/cake/libs/view/errors/missing_component_class.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/errors/missing_component_file.ctp b/cake/libs/view/errors/missing_component_file.ctp
index 3b8b874fb..fa44f497e 100644
--- a/cake/libs/view/errors/missing_component_file.ctp
+++ b/cake/libs/view/errors/missing_component_file.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/errors/missing_connection.ctp b/cake/libs/view/errors/missing_connection.ctp
index 1a1c1ad4a..66fd3500e 100644
--- a/cake/libs/view/errors/missing_connection.ctp
+++ b/cake/libs/view/errors/missing_connection.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/errors/missing_controller.ctp b/cake/libs/view/errors/missing_controller.ctp
index 676747284..acad3e50a 100644
--- a/cake/libs/view/errors/missing_controller.ctp
+++ b/cake/libs/view/errors/missing_controller.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/errors/missing_helper_class.ctp b/cake/libs/view/errors/missing_helper_class.ctp
index e1f464cdd..9718ae33c 100644
--- a/cake/libs/view/errors/missing_helper_class.ctp
+++ b/cake/libs/view/errors/missing_helper_class.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/errors/missing_helper_file.ctp b/cake/libs/view/errors/missing_helper_file.ctp
index 34d6d5dc7..5c33ca213 100644
--- a/cake/libs/view/errors/missing_helper_file.ctp
+++ b/cake/libs/view/errors/missing_helper_file.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/errors/missing_layout.ctp b/cake/libs/view/errors/missing_layout.ctp
index cb8445a44..c86a48d8b 100644
--- a/cake/libs/view/errors/missing_layout.ctp
+++ b/cake/libs/view/errors/missing_layout.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/errors/missing_model.ctp b/cake/libs/view/errors/missing_model.ctp
index c2d64e95f..bcd421fb8 100644
--- a/cake/libs/view/errors/missing_model.ctp
+++ b/cake/libs/view/errors/missing_model.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/errors/missing_scaffolddb.ctp b/cake/libs/view/errors/missing_scaffolddb.ctp
index 443199224..f694fbc7b 100644
--- a/cake/libs/view/errors/missing_scaffolddb.ctp
+++ b/cake/libs/view/errors/missing_scaffolddb.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/errors/missing_table.ctp b/cake/libs/view/errors/missing_table.ctp
index 1bdc59f69..e8be76f3d 100644
--- a/cake/libs/view/errors/missing_table.ctp
+++ b/cake/libs/view/errors/missing_table.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/errors/missing_view.ctp b/cake/libs/view/errors/missing_view.ctp
index 737da88c0..aefdae41b 100644
--- a/cake/libs/view/errors/missing_view.ctp
+++ b/cake/libs/view/errors/missing_view.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/errors/private_action.ctp b/cake/libs/view/errors/private_action.ctp
index 6d9e92c70..35d630529 100644
--- a/cake/libs/view/errors/private_action.ctp
+++ b/cake/libs/view/errors/private_action.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/errors/scaffold_error.ctp b/cake/libs/view/errors/scaffold_error.ctp
index 9ce156af7..09dc0eb52 100644
--- a/cake/libs/view/errors/scaffold_error.ctp
+++ b/cake/libs/view/errors/scaffold_error.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
index 3cdec2c2f..d4a873f76 100644
--- a/cake/libs/view/helper.php
+++ b/cake/libs/view/helper.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view
diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php
index d2eda08db..c2bbb5ba0 100644
--- a/cake/libs/view/helpers/ajax.php
+++ b/cake/libs/view/helpers/ajax.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
diff --git a/cake/libs/view/helpers/app_helper.php b/cake/libs/view/helpers/app_helper.php
index c57f438b8..3b751a8b4 100644
--- a/cake/libs/view/helpers/app_helper.php
+++ b/cake/libs/view/helpers/app_helper.php
@@ -9,13 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake
diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php
index f27663b4f..58757c77e 100644
--- a/cake/libs/view/helpers/cache.php
+++ b/cake/libs/view/helpers/cache.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 6e47d44cf..62982ee75 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index 43b885a34..044a511a7 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -6,13 +6,13 @@
  * Simplifies the construction of HTML elements.
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index 29ee2281a..f07a6cedc 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
index b13bc9c33..c8f46a439 100644
--- a/cake/libs/view/helpers/js.php
+++ b/cake/libs/view/helpers/js.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php
index 6c814e0f8..5e240d679 100644
--- a/cake/libs/view/helpers/number.php
+++ b/cake/libs/view/helpers/number.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 9fa185ddc..92c814a33 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -6,13 +6,13 @@
  * Generates pagination links
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
diff --git a/cake/libs/view/helpers/rss.php b/cake/libs/view/helpers/rss.php
index 5b8cb8362..6de685ebb 100644
--- a/cake/libs/view/helpers/rss.php
+++ b/cake/libs/view/helpers/rss.php
@@ -6,13 +6,13 @@
  * Simplifies the output of RSS feeds.
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php
index d78170ab1..e69658e84 100644
--- a/cake/libs/view/helpers/session.php
+++ b/cake/libs/view/helpers/session.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php
index fb687a1bb..737681ef9 100644
--- a/cake/libs/view/helpers/text.php
+++ b/cake/libs/view/helpers/text.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php
index fbd5cef7e..e9d0feca9 100644
--- a/cake/libs/view/helpers/time.php
+++ b/cake/libs/view/helpers/time.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
diff --git a/cake/libs/view/helpers/xml.php b/cake/libs/view/helpers/xml.php
index 53fd1382c..ab6810eb7 100644
--- a/cake/libs/view/helpers/xml.php
+++ b/cake/libs/view/helpers/xml.php
@@ -6,13 +6,13 @@
  * Simplifies the output of XML documents.
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
diff --git a/cake/libs/view/layouts/ajax.ctp b/cake/libs/view/layouts/ajax.ctp
index ca3459af8..e6bd065e0 100644
--- a/cake/libs/view/layouts/ajax.ctp
+++ b/cake/libs/view/layouts/ajax.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
diff --git a/cake/libs/view/layouts/default.ctp b/cake/libs/view/layouts/default.ctp
index 3b6fac081..9be4e143d 100644
--- a/cake/libs/view/layouts/default.ctp
+++ b/cake/libs/view/layouts/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
diff --git a/cake/libs/view/layouts/email/html/default.ctp b/cake/libs/view/layouts/email/html/default.ctp
index a41315a3a..1467a8847 100644
--- a/cake/libs/view/layouts/email/html/default.ctp
+++ b/cake/libs/view/layouts/email/html/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts.email.html
diff --git a/cake/libs/view/layouts/email/text/default.ctp b/cake/libs/view/layouts/email/text/default.ctp
index 4b0b62c41..502a393fc 100644
--- a/cake/libs/view/layouts/email/text/default.ctp
+++ b/cake/libs/view/layouts/email/text/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts.email.text
diff --git a/cake/libs/view/layouts/flash.ctp b/cake/libs/view/layouts/flash.ctp
index d896896eb..44b388f28 100644
--- a/cake/libs/view/layouts/flash.ctp
+++ b/cake/libs/view/layouts/flash.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
diff --git a/cake/libs/view/media.php b/cake/libs/view/media.php
index 5be837840..1738036fd 100644
--- a/cake/libs/view/media.php
+++ b/cake/libs/view/media.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view
diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp
index 46af7f332..61c427c60 100644
--- a/cake/libs/view/pages/home.ctp
+++ b/cake/libs/view/pages/home.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.pages
diff --git a/cake/libs/view/scaffolds/edit.ctp b/cake/libs/view/scaffolds/edit.ctp
index 6705b4bf4..36b4e845e 100644
--- a/cake/libs/view/scaffolds/edit.ctp
+++ b/cake/libs/view/scaffolds/edit.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.scaffolds
diff --git a/cake/libs/view/scaffolds/index.ctp b/cake/libs/view/scaffolds/index.ctp
index c5b9e0e7f..c67553b46 100644
--- a/cake/libs/view/scaffolds/index.ctp
+++ b/cake/libs/view/scaffolds/index.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.templates.views
diff --git a/cake/libs/view/scaffolds/view.ctp b/cake/libs/view/scaffolds/view.ctp
index a497ca673..5b3572c0e 100644
--- a/cake/libs/view/scaffolds/view.ctp
+++ b/cake/libs/view/scaffolds/view.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.scaffolds
diff --git a/cake/libs/view/theme.php b/cake/libs/view/theme.php
index 4167c810f..594cdb117 100644
--- a/cake/libs/view/theme.php
+++ b/cake/libs/view/theme.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 655e6d266..44f9437fe 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view
diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index 574bfe2bb..ad8cf15e0 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php
index 800cb7dc3..8920c0bc3 100644
--- a/cake/tests/cases/basics.test.php
+++ b/cake/tests/cases/basics.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases
diff --git a/cake/tests/cases/console/cake.test.php b/cake/tests/cases/console/cake.test.php
index 6eda913f8..949fede8a 100644
--- a/cake/tests/cases/console/cake.test.php
+++ b/cake/tests/cases/console/cake.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2007, Cake Software Foundation, Inc.
+ * Copyright 2005-2010, Cake Software Foundation, Inc.
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2007, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc.
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.console
diff --git a/cake/tests/cases/console/libs/acl.test.php b/cake/tests/cases/console/libs/acl.test.php
index f27a69436..55dff3402 100644
--- a/cake/tests/cases/console/libs/acl.test.php
+++ b/cake/tests/cases/console/libs/acl.test.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs.tasks
diff --git a/cake/tests/cases/console/libs/api.test.php b/cake/tests/cases/console/libs/api.test.php
index b5568fce7..1d089b179 100644
--- a/cake/tests/cases/console/libs/api.test.php
+++ b/cake/tests/cases/console/libs/api.test.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs.tasks
diff --git a/cake/tests/cases/console/libs/schema.test.php b/cake/tests/cases/console/libs/schema.test.php
index 063910dbf..e4cf0a856 100644
--- a/cake/tests/cases/console/libs/schema.test.php
+++ b/cake/tests/cases/console/libs/schema.test.php
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2009, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2009, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs.Shells
diff --git a/cake/tests/cases/console/libs/shell.test.php b/cake/tests/cases/console/libs/shell.test.php
index b832088e5..ec50f577b 100644
--- a/cake/tests/cases/console/libs/shell.test.php
+++ b/cake/tests/cases/console/libs/shell.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs
diff --git a/cake/tests/cases/console/libs/tasks/extract.test.php b/cake/tests/cases/console/libs/tasks/extract.test.php
index d393a5275..37e79dc27 100644
--- a/cake/tests/cases/console/libs/tasks/extract.test.php
+++ b/cake/tests/cases/console/libs/tasks/extract.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs.tasks
diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php
index a2e7f5c54..f61262f21 100644
--- a/cake/tests/cases/console/libs/tasks/model.test.php
+++ b/cake/tests/cases/console/libs/tasks/model.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2009, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2009, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs.tasks
diff --git a/cake/tests/cases/console/libs/tasks/test.test.php b/cake/tests/cases/console/libs/tasks/test.test.php
index 548f29606..b646dc554 100644
--- a/cake/tests/cases/console/libs/tasks/test.test.php
+++ b/cake/tests/cases/console/libs/tasks/test.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs.tasks
diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php
index bc6515f01..98f6312fb 100644
--- a/cake/tests/cases/dispatcher.test.php
+++ b/cake/tests/cases/dispatcher.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases
diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php
index 37d5ec633..82ed7762f 100644
--- a/cake/tests/cases/libs/cache.test.php
+++ b/cake/tests/cases/libs/cache.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/cache/apc.test.php b/cake/tests/cases/libs/cache/apc.test.php
index 5dd30c502..2f75cf9e2 100644
--- a/cake/tests/cases/libs/cache/apc.test.php
+++ b/cake/tests/cases/libs/cache/apc.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.cache
diff --git a/cake/tests/cases/libs/cache/file.test.php b/cake/tests/cases/libs/cache/file.test.php
index 89ee671bc..4bc0ab3d0 100644
--- a/cake/tests/cases/libs/cache/file.test.php
+++ b/cake/tests/cases/libs/cache/file.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.cache
diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/cake/tests/cases/libs/cache/memcache.test.php
index d26f360e8..aa56459ec 100644
--- a/cake/tests/cases/libs/cache/memcache.test.php
+++ b/cake/tests/cases/libs/cache/memcache.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.cache
diff --git a/cake/tests/cases/libs/cache/xcache.test.php b/cake/tests/cases/libs/cache/xcache.test.php
index 842cbfa7b..818d10ada 100644
--- a/cake/tests/cases/libs/cache/xcache.test.php
+++ b/cake/tests/cases/libs/cache/xcache.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.cache
diff --git a/cake/tests/cases/libs/cake_log.test.php b/cake/tests/cases/libs/cake_log.test.php
index 05dc39452..8ab46ca9a 100644
--- a/cake/tests/cases/libs/cake_log.test.php
+++ b/cake/tests/cases/libs/cake_log.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/cake_test_case.test.php b/cake/tests/cases/libs/cake_test_case.test.php
index 930683c75..5340f8f5d 100644
--- a/cake/tests/cases/libs/cake_test_case.test.php
+++ b/cake/tests/cases/libs/cake_test_case.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.
diff --git a/cake/tests/cases/libs/cake_test_fixture.test.php b/cake/tests/cases/libs/cake_test_fixture.test.php
index d5844bc6c..b2e438abb 100644
--- a/cake/tests/cases/libs/cake_test_fixture.test.php
+++ b/cake/tests/cases/libs/cake_test_fixture.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/cases/libs/class_registry.test.php b/cake/tests/cases/libs/class_registry.test.php
index d40ed0e83..e8dd6886d 100644
--- a/cake/tests/cases/libs/class_registry.test.php
+++ b/cake/tests/cases/libs/class_registry.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/code_coverage_manager.test.php b/cake/tests/cases/libs/code_coverage_manager.test.php
index 9a1e6c41e..af1ae0b73 100644
--- a/cake/tests/cases/libs/code_coverage_manager.test.php
+++ b/cake/tests/cases/libs/code_coverage_manager.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
index 54f1aa59c..af0f26402 100644
--- a/cake/tests/cases/libs/configure.test.php
+++ b/cake/tests/cases/libs/configure.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/controller/component.test.php b/cake/tests/cases/libs/controller/component.test.php
index 8ab7227c2..cf1386cd7 100644
--- a/cake/tests/cases/libs/controller/component.test.php
+++ b/cake/tests/cases/libs/controller/component.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller
diff --git a/cake/tests/cases/libs/controller/components/acl.test.php b/cake/tests/cases/libs/controller/components/acl.test.php
index 755d7ae19..2daff3f67 100644
--- a/cake/tests/cases/libs/controller/components/acl.test.php
+++ b/cake/tests/cases/libs/controller/components/acl.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller.components
diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php
index 481b2dd5f..04bb9acce 100644
--- a/cake/tests/cases/libs/controller/components/auth.test.php
+++ b/cake/tests/cases/libs/controller/components/auth.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.cases.libs.controller.components
diff --git a/cake/tests/cases/libs/controller/components/cookie.test.php b/cake/tests/cases/libs/controller/components/cookie.test.php
index 5d8d87aa0..c5ebef42b 100644
--- a/cake/tests/cases/libs/controller/components/cookie.test.php
+++ b/cake/tests/cases/libs/controller/components/cookie.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller.components
diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php
index 8baf95e4b..32c97be30 100644
--- a/cake/tests/cases/libs/controller/components/email.test.php
+++ b/cake/tests/cases/libs/controller/components/email.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.cases.libs.controller.components
diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php
index e0adee344..24ce58218 100644
--- a/cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/cake/tests/cases/libs/controller/components/request_handler.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller.components
diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php
index cc7798aa4..111aa0cb9 100644
--- a/cake/tests/cases/libs/controller/components/security.test.php
+++ b/cake/tests/cases/libs/controller/components/security.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller.components
diff --git a/cake/tests/cases/libs/controller/components/session.test.php b/cake/tests/cases/libs/controller/components/session.test.php
index b79f043c9..4b6dd69ba 100644
--- a/cake/tests/cases/libs/controller/components/session.test.php
+++ b/cake/tests/cases/libs/controller/components/session.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller.components
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index 4b978a03e..a522bc252 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller
diff --git a/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
index 4ca4db328..b0a5a3733 100644
--- a/cake/tests/cases/libs/controller/controller_merge_vars.test.php
+++ b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller
diff --git a/cake/tests/cases/libs/controller/pages_controller.test.php b/cake/tests/cases/libs/controller/pages_controller.test.php
index 66980e744..50fdd5177 100644
--- a/cake/tests/cases/libs/controller/pages_controller.test.php
+++ b/cake/tests/cases/libs/controller/pages_controller.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller
diff --git a/cake/tests/cases/libs/controller/scaffold.test.php b/cake/tests/cases/libs/controller/scaffold.test.php
index 72cab3eb9..729523253 100644
--- a/cake/tests/cases/libs/controller/scaffold.test.php
+++ b/cake/tests/cases/libs/controller/scaffold.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller
diff --git a/cake/tests/cases/libs/debugger.test.php b/cake/tests/cases/libs/debugger.test.php
index 8f57cbbd0..0dd77a6b6 100644
--- a/cake/tests/cases/libs/debugger.test.php
+++ b/cake/tests/cases/libs/debugger.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/error.test.php b/cake/tests/cases/libs/error.test.php
index e3d233e1e..2a13f5e56 100644
--- a/cake/tests/cases/libs/error.test.php
+++ b/cake/tests/cases/libs/error.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/file.test.php b/cake/tests/cases/libs/file.test.php
index f0d64a7bf..2a395d0ac 100644
--- a/cake/tests/cases/libs/file.test.php
+++ b/cake/tests/cases/libs/file.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/flay.test.php b/cake/tests/cases/libs/flay.test.php
index 79e55c95e..c064ff5e3 100644
--- a/cake/tests/cases/libs/flay.test.php
+++ b/cake/tests/cases/libs/flay.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/folder.test.php b/cake/tests/cases/libs/folder.test.php
index 0793630c2..c01cb86a8 100644
--- a/cake/tests/cases/libs/folder.test.php
+++ b/cake/tests/cases/libs/folder.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php
index 581e1c697..49e3ed58e 100644
--- a/cake/tests/cases/libs/http_socket.test.php
+++ b/cake/tests/cases/libs/http_socket.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/i18n.test.php b/cake/tests/cases/libs/i18n.test.php
index 01b271871..3d395d26e 100644
--- a/cake/tests/cases/libs/i18n.test.php
+++ b/cake/tests/cases/libs/i18n.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php
index 3823dbc72..d99bdcb2b 100644
--- a/cake/tests/cases/libs/inflector.test.php
+++ b/cake/tests/cases/libs/inflector.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php
index 48df8fa3c..5687571fe 100644
--- a/cake/tests/cases/libs/l10n.test.php
+++ b/cake/tests/cases/libs/l10n.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/magic_db.test.php b/cake/tests/cases/libs/magic_db.test.php
index 7ab7b642e..1be3c30cb 100644
--- a/cake/tests/cases/libs/magic_db.test.php
+++ b/cake/tests/cases/libs/magic_db.test.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/tests/cases/libs/model/behaviors/acl.test.php b/cake/tests/cases/libs/model/behaviors/acl.test.php
index 4c8f70750..102d75884 100644
--- a/cake/tests/cases/libs/model/behaviors/acl.test.php
+++ b/cake/tests/cases/libs/model/behaviors/acl.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.tests.model.behaviors.acl
diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index d5ae197c8..99aa304c2 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model.behaviors
diff --git a/cake/tests/cases/libs/model/behaviors/translate.test.php b/cake/tests/cases/libs/model/behaviors/translate.test.php
index 3ec69f02b..3914dec46 100644
--- a/cake/tests/cases/libs/model/behaviors/translate.test.php
+++ b/cake/tests/cases/libs/model/behaviors/translate.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model.behaviors
diff --git a/cake/tests/cases/libs/model/behaviors/tree.test.php b/cake/tests/cases/libs/model/behaviors/tree.test.php
index 86834122b..8f58ac003 100644
--- a/cake/tests/cases/libs/model/behaviors/tree.test.php
+++ b/cake/tests/cases/libs/model/behaviors/tree.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model.behaviors
diff --git a/cake/tests/cases/libs/model/connection_manager.test.php b/cake/tests/cases/libs/model/connection_manager.test.php
index 4bc226854..00b850b02 100644
--- a/cake/tests/cases/libs/model/connection_manager.test.php
+++ b/cake/tests/cases/libs/model/connection_manager.test.php
@@ -6,13 +6,13 @@
  *
  * PHP versions 4 and 5
  *
- * Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
index 45f71fe16..55acd701e 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
index b883abce8..fa969cb86 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
index 26a9bc9c0..1f4a4f919 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
index 2e1e87a66..0431f7d7f 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
index 6b835890a..af956e4dc 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
index ff6588668..2c2b628d9 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
index 2f1ea4ad6..e4e0fbcf7 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
index 3dbe92991..321574ee6 100644
--- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *	Licensed under The Open Group Test Suite License
  *	Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model.datasources
diff --git a/cake/tests/cases/libs/model/db_acl.test.php b/cake/tests/cases/libs/model/db_acl.test.php
index 82d4d15ad..2de13d0a0 100644
--- a/cake/tests/cases/libs/model/db_acl.test.php
+++ b/cake/tests/cases/libs/model/db_acl.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller.components.dbacl.models
diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php
index 1c688c781..bf420f6a4 100644
--- a/cake/tests/cases/libs/model/model.test.php
+++ b/cake/tests/cases/libs/model/model.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/model_delete.test.php b/cake/tests/cases/libs/model/model_delete.test.php
index 2be205e92..0742d80d0 100644
--- a/cake/tests/cases/libs/model/model_delete.test.php
+++ b/cake/tests/cases/libs/model/model_delete.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php
index cc1d8b20c..43cd16e47 100644
--- a/cake/tests/cases/libs/model/model_integration.test.php
+++ b/cake/tests/cases/libs/model/model_integration.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php
index 2a183d159..2f52bc525 100644
--- a/cake/tests/cases/libs/model/model_read.test.php
+++ b/cake/tests/cases/libs/model/model_read.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/cake/tests/cases/libs/model/model_validation.test.php
index 54aa474e3..7f452bedd 100644
--- a/cake/tests/cases/libs/model/model_validation.test.php
+++ b/cake/tests/cases/libs/model/model_validation.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
index 31388b2d6..ea216e5f9 100644
--- a/cake/tests/cases/libs/model/model_write.test.php
+++ b/cake/tests/cases/libs/model/model_write.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index cb2089679..27829184f 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/schema.test.php b/cake/tests/cases/libs/model/schema.test.php
index fc35f5c13..2a00095d1 100644
--- a/cake/tests/cases/libs/model/schema.test.php
+++ b/cake/tests/cases/libs/model/schema.test.php
@@ -7,13 +7,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/multibyte.test.php b/cake/tests/cases/libs/multibyte.test.php
index dd0ea371c..b33cc3798 100644
--- a/cake/tests/cases/libs/multibyte.test.php
+++ b/cake/tests/cases/libs/multibyte.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/object.test.php b/cake/tests/cases/libs/object.test.php
index 3ce6fbbfd..de63a517d 100644
--- a/cake/tests/cases/libs/object.test.php
+++ b/cake/tests/cases/libs/object.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/overloadable.test.php b/cake/tests/cases/libs/overloadable.test.php
index ed06e8cc7..0b6c9c235 100644
--- a/cake/tests/cases/libs/overloadable.test.php
+++ b/cake/tests/cases/libs/overloadable.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index 3e58f0ae1..2f34423c6 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *	Licensed under The Open Group Test Suite License
  *	Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/sanitize.test.php b/cake/tests/cases/libs/sanitize.test.php
index 1899f16c7..f32371bf1 100644
--- a/cake/tests/cases/libs/sanitize.test.php
+++ b/cake/tests/cases/libs/sanitize.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/security.test.php b/cake/tests/cases/libs/security.test.php
index f00af06b7..320f4a508 100644
--- a/cake/tests/cases/libs/security.test.php
+++ b/cake/tests/cases/libs/security.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/session.test.php b/cake/tests/cases/libs/session.test.php
index f74d626f8..9af6d79d4 100644
--- a/cake/tests/cases/libs/session.test.php
+++ b/cake/tests/cases/libs/session.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index 2b758e49e..6f41670c7 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/socket.test.php b/cake/tests/cases/libs/socket.test.php
index 931f2b531..e401917bc 100644
--- a/cake/tests/cases/libs/socket.test.php
+++ b/cake/tests/cases/libs/socket.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/string.test.php b/cake/tests/cases/libs/string.test.php
index 1e15a89be..0f6896fa5 100644
--- a/cake/tests/cases/libs/string.test.php
+++ b/cake/tests/cases/libs/string.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/test_manager.test.php b/cake/tests/cases/libs/test_manager.test.php
index b8eb5de29..f26f8bc0c 100644
--- a/cake/tests/cases/libs/test_manager.test.php
+++ b/cake/tests/cases/libs/test_manager.test.php
@@ -8,7 +8,7 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc.
+ * Copyright 2005-2010, Cake Software Foundation, Inc.
  *								1785 E. Sahara Avenue, Suite 490-204
  *								Las Vegas, Nevada 89104
  *
@@ -16,7 +16,7 @@
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php
index 4c7721cbc..45e85da10 100644
--- a/cake/tests/cases/libs/validation.test.php
+++ b/cake/tests/cases/libs/validation.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/view/helper.test.php b/cake/tests/cases/libs/view/helper.test.php
index e380650b9..8be56b040 100644
--- a/cake/tests/cases/libs/view/helper.test.php
+++ b/cake/tests/cases/libs/view/helper.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/view/helpers/ajax.test.php b/cake/tests/cases/libs/view/helpers/ajax.test.php
index 439846e0d..133389350 100644
--- a/cake/tests/cases/libs/view/helpers/ajax.test.php
+++ b/cake/tests/cases/libs/view/helpers/ajax.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/cache.test.php b/cake/tests/cases/libs/view/helpers/cache.test.php
index 66b913642..f6b265e6e 100644
--- a/cake/tests/cases/libs/view/helpers/cache.test.php
+++ b/cake/tests/cases/libs/view/helpers/cache.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index c1d90823a..c94ea6c2d 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
index 635e908bf..39249c7c3 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/javascript.test.php b/cake/tests/cases/libs/view/helpers/javascript.test.php
index e44a0271a..b5d298f80 100644
--- a/cake/tests/cases/libs/view/helpers/javascript.test.php
+++ b/cake/tests/cases/libs/view/helpers/javascript.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php
index d0307089b..8978b4201 100644
--- a/cake/tests/cases/libs/view/helpers/js.test.php
+++ b/cake/tests/cases/libs/view/helpers/js.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/number.test.php b/cake/tests/cases/libs/view/helpers/number.test.php
index ccc54540b..4784a6198 100644
--- a/cake/tests/cases/libs/view/helpers/number.test.php
+++ b/cake/tests/cases/libs/view/helpers/number.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 3b8817ab8..22744f2a1 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/rss.test.php b/cake/tests/cases/libs/view/helpers/rss.test.php
index 0f49570ff..49c534911 100644
--- a/cake/tests/cases/libs/view/helpers/rss.test.php
+++ b/cake/tests/cases/libs/view/helpers/rss.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php
index eb6e295e7..9c56ddc81 100644
--- a/cake/tests/cases/libs/view/helpers/session.test.php
+++ b/cake/tests/cases/libs/view/helpers/session.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/text.test.php b/cake/tests/cases/libs/view/helpers/text.test.php
index bd2b08526..283e17df0 100644
--- a/cake/tests/cases/libs/view/helpers/text.test.php
+++ b/cake/tests/cases/libs/view/helpers/text.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/time.test.php b/cake/tests/cases/libs/view/helpers/time.test.php
index 997d3092b..149e895c0 100644
--- a/cake/tests/cases/libs/view/helpers/time.test.php
+++ b/cake/tests/cases/libs/view/helpers/time.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/xml.test.php b/cake/tests/cases/libs/view/helpers/xml.test.php
index 3be7a729c..6ffa9c2a7 100644
--- a/cake/tests/cases/libs/view/helpers/xml.test.php
+++ b/cake/tests/cases/libs/view/helpers/xml.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/theme.test.php b/cake/tests/cases/libs/view/theme.test.php
index 6f68cbf1f..f5f0598f2 100644
--- a/cake/tests/cases/libs/view/theme.test.php
+++ b/cake/tests/cases/libs/view/theme.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/view/view.test.php b/cake/tests/cases/libs/view/view.test.php
index 103a4b736..03174e592 100644
--- a/cake/tests/cases/libs/view/view.test.php
+++ b/cake/tests/cases/libs/view/view.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php
index e92133ba0..e252ed188 100644
--- a/cake/tests/cases/libs/xml.test.php
+++ b/cake/tests/cases/libs/xml.test.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/fixtures/account_fixture.php b/cake/tests/fixtures/account_fixture.php
index 5bd0e28c4..0b725813e 100644
--- a/cake/tests/fixtures/account_fixture.php
+++ b/cake/tests/fixtures/account_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/aco_action_fixture.php b/cake/tests/fixtures/aco_action_fixture.php
index 2c35d5fe6..a07a22fb0 100644
--- a/cake/tests/fixtures/aco_action_fixture.php
+++ b/cake/tests/fixtures/aco_action_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/aco_fixture.php b/cake/tests/fixtures/aco_fixture.php
index 5a8a1446d..98f4c5ea6 100644
--- a/cake/tests/fixtures/aco_fixture.php
+++ b/cake/tests/fixtures/aco_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/aco_two_fixture.php b/cake/tests/fixtures/aco_two_fixture.php
index c5c3708a5..09e383005 100644
--- a/cake/tests/fixtures/aco_two_fixture.php
+++ b/cake/tests/fixtures/aco_two_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/advertisement_fixture.php b/cake/tests/fixtures/advertisement_fixture.php
index f5062336a..2bd0cc7df 100644
--- a/cake/tests/fixtures/advertisement_fixture.php
+++ b/cake/tests/fixtures/advertisement_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/another_article_fixture.php b/cake/tests/fixtures/another_article_fixture.php
index ec3d19c0c..cf34b1262 100644
--- a/cake/tests/fixtures/another_article_fixture.php
+++ b/cake/tests/fixtures/another_article_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/apple_fixture.php b/cake/tests/fixtures/apple_fixture.php
index d8d3e1250..cce8ea937 100644
--- a/cake/tests/fixtures/apple_fixture.php
+++ b/cake/tests/fixtures/apple_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/aro_fixture.php b/cake/tests/fixtures/aro_fixture.php
index 26180de0e..87bb73a57 100644
--- a/cake/tests/fixtures/aro_fixture.php
+++ b/cake/tests/fixtures/aro_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/aro_two_fixture.php b/cake/tests/fixtures/aro_two_fixture.php
index 8d2337bc5..fc583b173 100644
--- a/cake/tests/fixtures/aro_two_fixture.php
+++ b/cake/tests/fixtures/aro_two_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/aros_aco_fixture.php b/cake/tests/fixtures/aros_aco_fixture.php
index be181c6fb..7bb651499 100644
--- a/cake/tests/fixtures/aros_aco_fixture.php
+++ b/cake/tests/fixtures/aros_aco_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/aros_aco_two_fixture.php b/cake/tests/fixtures/aros_aco_two_fixture.php
index 74866e5fe..fcc1ab654 100644
--- a/cake/tests/fixtures/aros_aco_two_fixture.php
+++ b/cake/tests/fixtures/aros_aco_two_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/article_featured_fixture.php b/cake/tests/fixtures/article_featured_fixture.php
index 67b967499..d45178504 100644
--- a/cake/tests/fixtures/article_featured_fixture.php
+++ b/cake/tests/fixtures/article_featured_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/article_featureds_tags_fixture.php b/cake/tests/fixtures/article_featureds_tags_fixture.php
index e1ac130f6..c1b6641d7 100644
--- a/cake/tests/fixtures/article_featureds_tags_fixture.php
+++ b/cake/tests/fixtures/article_featureds_tags_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/article_fixture.php b/cake/tests/fixtures/article_fixture.php
index fe2721d74..64dd4b38d 100644
--- a/cake/tests/fixtures/article_fixture.php
+++ b/cake/tests/fixtures/article_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/articles_tag_fixture.php b/cake/tests/fixtures/articles_tag_fixture.php
index a19bcd142..f7307c634 100644
--- a/cake/tests/fixtures/articles_tag_fixture.php
+++ b/cake/tests/fixtures/articles_tag_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/attachment_fixture.php b/cake/tests/fixtures/attachment_fixture.php
index de0d8b492..17ae330fe 100644
--- a/cake/tests/fixtures/attachment_fixture.php
+++ b/cake/tests/fixtures/attachment_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/auth_user_custom_field_fixture.php b/cake/tests/fixtures/auth_user_custom_field_fixture.php
index ebc2c3f29..759290a14 100644
--- a/cake/tests/fixtures/auth_user_custom_field_fixture.php
+++ b/cake/tests/fixtures/auth_user_custom_field_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/auth_user_fixture.php b/cake/tests/fixtures/auth_user_fixture.php
index d16c7759e..7766fdb5a 100644
--- a/cake/tests/fixtures/auth_user_fixture.php
+++ b/cake/tests/fixtures/auth_user_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/author_fixture.php b/cake/tests/fixtures/author_fixture.php
index 96ee0ea44..de8178d38 100644
--- a/cake/tests/fixtures/author_fixture.php
+++ b/cake/tests/fixtures/author_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/basket_fixture.php b/cake/tests/fixtures/basket_fixture.php
index c20014ff3..ee3182294 100644
--- a/cake/tests/fixtures/basket_fixture.php
+++ b/cake/tests/fixtures/basket_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/bid_fixture.php b/cake/tests/fixtures/bid_fixture.php
index 9b118cca8..84cb61fe9 100644
--- a/cake/tests/fixtures/bid_fixture.php
+++ b/cake/tests/fixtures/bid_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/binary_test_fixture.php b/cake/tests/fixtures/binary_test_fixture.php
index b9c09cbe2..889d05b9e 100644
--- a/cake/tests/fixtures/binary_test_fixture.php
+++ b/cake/tests/fixtures/binary_test_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/book_fixture.php b/cake/tests/fixtures/book_fixture.php
index 823408c8f..b86499c58 100644
--- a/cake/tests/fixtures/book_fixture.php
+++ b/cake/tests/fixtures/book_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/cache_test_model_fixture.php b/cake/tests/fixtures/cache_test_model_fixture.php
index ff4f855c0..b4009c3f5 100644
--- a/cake/tests/fixtures/cache_test_model_fixture.php
+++ b/cake/tests/fixtures/cache_test_model_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/callback_fixture.php b/cake/tests/fixtures/callback_fixture.php
index 6ef3d1eb5..824fd8e46 100644
--- a/cake/tests/fixtures/callback_fixture.php
+++ b/cake/tests/fixtures/callback_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/category_fixture.php b/cake/tests/fixtures/category_fixture.php
index 5cb04f106..b0830e184 100644
--- a/cake/tests/fixtures/category_fixture.php
+++ b/cake/tests/fixtures/category_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/category_thread_fixture.php b/cake/tests/fixtures/category_thread_fixture.php
index 5da10d7d8..6804ef246 100644
--- a/cake/tests/fixtures/category_thread_fixture.php
+++ b/cake/tests/fixtures/category_thread_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/cd_fixture.php b/cake/tests/fixtures/cd_fixture.php
index 16b74f565..241fd7a1e 100644
--- a/cake/tests/fixtures/cd_fixture.php
+++ b/cake/tests/fixtures/cd_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/comment_fixture.php b/cake/tests/fixtures/comment_fixture.php
index b2283c9af..f8c22966c 100644
--- a/cake/tests/fixtures/comment_fixture.php
+++ b/cake/tests/fixtures/comment_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/content_account_fixture.php b/cake/tests/fixtures/content_account_fixture.php
index 8eb7be738..a4b8c4f35 100644
--- a/cake/tests/fixtures/content_account_fixture.php
+++ b/cake/tests/fixtures/content_account_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/content_fixture.php b/cake/tests/fixtures/content_fixture.php
index b7e3131cd..88b0eb249 100644
--- a/cake/tests/fixtures/content_fixture.php
+++ b/cake/tests/fixtures/content_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/counter_cache_post_fixture.php b/cake/tests/fixtures/counter_cache_post_fixture.php
index 4f696eb3a..5fa7a50b8 100644
--- a/cake/tests/fixtures/counter_cache_post_fixture.php
+++ b/cake/tests/fixtures/counter_cache_post_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php b/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
index 15c577dc2..3d7ba8084 100644
--- a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
+++ b/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/counter_cache_user_fixture.php b/cake/tests/fixtures/counter_cache_user_fixture.php
index 4739dab0a..1e22b5764 100644
--- a/cake/tests/fixtures/counter_cache_user_fixture.php
+++ b/cake/tests/fixtures/counter_cache_user_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php b/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
index e7bb7658b..80b103f1e 100644
--- a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
+++ b/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/data_test_fixture.php b/cake/tests/fixtures/data_test_fixture.php
index afed9aa9b..c3d92e545 100644
--- a/cake/tests/fixtures/data_test_fixture.php
+++ b/cake/tests/fixtures/data_test_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/datatype_fixture.php b/cake/tests/fixtures/datatype_fixture.php
index 281da2f48..28cd7cdcc 100644
--- a/cake/tests/fixtures/datatype_fixture.php
+++ b/cake/tests/fixtures/datatype_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/dependency_fixture.php b/cake/tests/fixtures/dependency_fixture.php
index 8b1720798..cf8b05706 100644
--- a/cake/tests/fixtures/dependency_fixture.php
+++ b/cake/tests/fixtures/dependency_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/device_fixture.php b/cake/tests/fixtures/device_fixture.php
index 3b0638d15..6a6dd80ea 100644
--- a/cake/tests/fixtures/device_fixture.php
+++ b/cake/tests/fixtures/device_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/device_type_category_fixture.php b/cake/tests/fixtures/device_type_category_fixture.php
index ee33c18b2..1f78c2aeb 100644
--- a/cake/tests/fixtures/device_type_category_fixture.php
+++ b/cake/tests/fixtures/device_type_category_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/device_type_fixture.php b/cake/tests/fixtures/device_type_fixture.php
index cb8970a57..0ccaf6dfa 100644
--- a/cake/tests/fixtures/device_type_fixture.php
+++ b/cake/tests/fixtures/device_type_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/document_directory_fixture.php b/cake/tests/fixtures/document_directory_fixture.php
index ff67dfa47..93583552f 100644
--- a/cake/tests/fixtures/document_directory_fixture.php
+++ b/cake/tests/fixtures/document_directory_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/document_fixture.php b/cake/tests/fixtures/document_fixture.php
index fde15f92d..aa7c1b1fa 100644
--- a/cake/tests/fixtures/document_fixture.php
+++ b/cake/tests/fixtures/document_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/exterior_type_category_fixture.php b/cake/tests/fixtures/exterior_type_category_fixture.php
index 0905c3eca..c86e9bc39 100644
--- a/cake/tests/fixtures/exterior_type_category_fixture.php
+++ b/cake/tests/fixtures/exterior_type_category_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/feature_set_fixture.php b/cake/tests/fixtures/feature_set_fixture.php
index 533601535..8a0c51264 100644
--- a/cake/tests/fixtures/feature_set_fixture.php
+++ b/cake/tests/fixtures/feature_set_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/featured_fixture.php b/cake/tests/fixtures/featured_fixture.php
index 3f3e83372..78e838bfe 100644
--- a/cake/tests/fixtures/featured_fixture.php
+++ b/cake/tests/fixtures/featured_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/film_file_fixture.php b/cake/tests/fixtures/film_file_fixture.php
index 1483947a3..e815980fd 100644
--- a/cake/tests/fixtures/film_file_fixture.php
+++ b/cake/tests/fixtures/film_file_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/flag_tree_fixture.php b/cake/tests/fixtures/flag_tree_fixture.php
index d81744261..8a4b408ee 100644
--- a/cake/tests/fixtures/flag_tree_fixture.php
+++ b/cake/tests/fixtures/flag_tree_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/fruit_fixture.php b/cake/tests/fixtures/fruit_fixture.php
index bf90baea8..e8bf6fb91 100644
--- a/cake/tests/fixtures/fruit_fixture.php
+++ b/cake/tests/fixtures/fruit_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/fruits_uuid_tag_fixture.php b/cake/tests/fixtures/fruits_uuid_tag_fixture.php
index 7c84c660d..9640e6d01 100644
--- a/cake/tests/fixtures/fruits_uuid_tag_fixture.php
+++ b/cake/tests/fixtures/fruits_uuid_tag_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/home_fixture.php b/cake/tests/fixtures/home_fixture.php
index f88b8f7b0..cc788b642 100644
--- a/cake/tests/fixtures/home_fixture.php
+++ b/cake/tests/fixtures/home_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/image_fixture.php b/cake/tests/fixtures/image_fixture.php
index e30862fc9..76a78367c 100644
--- a/cake/tests/fixtures/image_fixture.php
+++ b/cake/tests/fixtures/image_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/item_fixture.php b/cake/tests/fixtures/item_fixture.php
index 1602fb698..bb2ba55b5 100644
--- a/cake/tests/fixtures/item_fixture.php
+++ b/cake/tests/fixtures/item_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/items_portfolio_fixture.php b/cake/tests/fixtures/items_portfolio_fixture.php
index fb7dd71bb..63ea6ee5c 100644
--- a/cake/tests/fixtures/items_portfolio_fixture.php
+++ b/cake/tests/fixtures/items_portfolio_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/join_a_b_fixture.php b/cake/tests/fixtures/join_a_b_fixture.php
index c1a5db5df..4949e482b 100644
--- a/cake/tests/fixtures/join_a_b_fixture.php
+++ b/cake/tests/fixtures/join_a_b_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/join_a_c_fixture.php b/cake/tests/fixtures/join_a_c_fixture.php
index 2fc335b3e..a05b539c2 100644
--- a/cake/tests/fixtures/join_a_c_fixture.php
+++ b/cake/tests/fixtures/join_a_c_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/join_a_fixture.php b/cake/tests/fixtures/join_a_fixture.php
index a4401e452..8e23c7894 100644
--- a/cake/tests/fixtures/join_a_fixture.php
+++ b/cake/tests/fixtures/join_a_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/join_b_fixture.php b/cake/tests/fixtures/join_b_fixture.php
index 16294ce97..0bba28773 100644
--- a/cake/tests/fixtures/join_b_fixture.php
+++ b/cake/tests/fixtures/join_b_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/join_c_fixture.php b/cake/tests/fixtures/join_c_fixture.php
index 333f3e28b..404291744 100644
--- a/cake/tests/fixtures/join_c_fixture.php
+++ b/cake/tests/fixtures/join_c_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/join_thing_fixture.php b/cake/tests/fixtures/join_thing_fixture.php
index 59ebe680c..e580e9387 100644
--- a/cake/tests/fixtures/join_thing_fixture.php
+++ b/cake/tests/fixtures/join_thing_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/message_fixture.php b/cake/tests/fixtures/message_fixture.php
index 94b53d5ca..807e9e089 100644
--- a/cake/tests/fixtures/message_fixture.php
+++ b/cake/tests/fixtures/message_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/my_categories_my_products_fixture.php b/cake/tests/fixtures/my_categories_my_products_fixture.php
index b570340fc..36b2ab05a 100644
--- a/cake/tests/fixtures/my_categories_my_products_fixture.php
+++ b/cake/tests/fixtures/my_categories_my_products_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/my_categories_my_users_fixture.php b/cake/tests/fixtures/my_categories_my_users_fixture.php
index d708d8dc5..166c7983f 100644
--- a/cake/tests/fixtures/my_categories_my_users_fixture.php
+++ b/cake/tests/fixtures/my_categories_my_users_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/my_category_fixture.php b/cake/tests/fixtures/my_category_fixture.php
index c333890c3..66e837eff 100644
--- a/cake/tests/fixtures/my_category_fixture.php
+++ b/cake/tests/fixtures/my_category_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/my_product_fixture.php b/cake/tests/fixtures/my_product_fixture.php
index 9e2f7948a..ddb42aa48 100644
--- a/cake/tests/fixtures/my_product_fixture.php
+++ b/cake/tests/fixtures/my_product_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/my_user_fixture.php b/cake/tests/fixtures/my_user_fixture.php
index 1806851a8..62c58c8cc 100644
--- a/cake/tests/fixtures/my_user_fixture.php
+++ b/cake/tests/fixtures/my_user_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/node_fixture.php b/cake/tests/fixtures/node_fixture.php
index a75ac25ae..ff77dfccd 100644
--- a/cake/tests/fixtures/node_fixture.php
+++ b/cake/tests/fixtures/node_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/number_tree_fixture.php b/cake/tests/fixtures/number_tree_fixture.php
index 4e1b973e8..98978bc67 100644
--- a/cake/tests/fixtures/number_tree_fixture.php
+++ b/cake/tests/fixtures/number_tree_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/number_tree_two_fixture.php b/cake/tests/fixtures/number_tree_two_fixture.php
index 244191c32..e45e29d80 100644
--- a/cake/tests/fixtures/number_tree_two_fixture.php
+++ b/cake/tests/fixtures/number_tree_two_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/numeric_article_fixture.php b/cake/tests/fixtures/numeric_article_fixture.php
index 44fdce11c..0b7f32ba3 100644
--- a/cake/tests/fixtures/numeric_article_fixture.php
+++ b/cake/tests/fixtures/numeric_article_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/overall_favorite_fixture.php b/cake/tests/fixtures/overall_favorite_fixture.php
index b36ba1b44..2f0889e83 100644
--- a/cake/tests/fixtures/overall_favorite_fixture.php
+++ b/cake/tests/fixtures/overall_favorite_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/person_fixture.php b/cake/tests/fixtures/person_fixture.php
index 160befaeb..493b4e708 100644
--- a/cake/tests/fixtures/person_fixture.php
+++ b/cake/tests/fixtures/person_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/portfolio_fixture.php b/cake/tests/fixtures/portfolio_fixture.php
index 7b4bcb584..26b07de51 100644
--- a/cake/tests/fixtures/portfolio_fixture.php
+++ b/cake/tests/fixtures/portfolio_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/post_fixture.php b/cake/tests/fixtures/post_fixture.php
index 9277517ed..1db461778 100644
--- a/cake/tests/fixtures/post_fixture.php
+++ b/cake/tests/fixtures/post_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/posts_tag_fixture.php b/cake/tests/fixtures/posts_tag_fixture.php
index 2c4ae6c7f..a86a0253c 100644
--- a/cake/tests/fixtures/posts_tag_fixture.php
+++ b/cake/tests/fixtures/posts_tag_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/primary_model_fixture.php b/cake/tests/fixtures/primary_model_fixture.php
index 8c0b3e7bc..0901632a5 100644
--- a/cake/tests/fixtures/primary_model_fixture.php
+++ b/cake/tests/fixtures/primary_model_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/product_fixture.php b/cake/tests/fixtures/product_fixture.php
index 9355030eb..ccdbf5aa8 100644
--- a/cake/tests/fixtures/product_fixture.php
+++ b/cake/tests/fixtures/product_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/project_fixture.php b/cake/tests/fixtures/project_fixture.php
index 6f48b05b8..428ed823a 100644
--- a/cake/tests/fixtures/project_fixture.php
+++ b/cake/tests/fixtures/project_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/sample_fixture.php b/cake/tests/fixtures/sample_fixture.php
index 87448938a..126d8872d 100644
--- a/cake/tests/fixtures/sample_fixture.php
+++ b/cake/tests/fixtures/sample_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/secondary_model_fixture.php b/cake/tests/fixtures/secondary_model_fixture.php
index 8c7ccfc3a..75e061f1c 100644
--- a/cake/tests/fixtures/secondary_model_fixture.php
+++ b/cake/tests/fixtures/secondary_model_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/session_fixture.php b/cake/tests/fixtures/session_fixture.php
index 1dc3c751a..2fb0fcf2f 100644
--- a/cake/tests/fixtures/session_fixture.php
+++ b/cake/tests/fixtures/session_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/something_else_fixture.php b/cake/tests/fixtures/something_else_fixture.php
index 7b6dbd2cd..2206f4d4b 100644
--- a/cake/tests/fixtures/something_else_fixture.php
+++ b/cake/tests/fixtures/something_else_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/something_fixture.php b/cake/tests/fixtures/something_fixture.php
index cecfb3f9d..654233c0c 100644
--- a/cake/tests/fixtures/something_fixture.php
+++ b/cake/tests/fixtures/something_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/stories_tag_fixture.php b/cake/tests/fixtures/stories_tag_fixture.php
index b39566abb..140cc047d 100644
--- a/cake/tests/fixtures/stories_tag_fixture.php
+++ b/cake/tests/fixtures/stories_tag_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/story_fixture.php b/cake/tests/fixtures/story_fixture.php
index c8e90de6d..333e87958 100644
--- a/cake/tests/fixtures/story_fixture.php
+++ b/cake/tests/fixtures/story_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/syfile_fixture.php b/cake/tests/fixtures/syfile_fixture.php
index 8e5a075ad..0e2c52eba 100644
--- a/cake/tests/fixtures/syfile_fixture.php
+++ b/cake/tests/fixtures/syfile_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/tag_fixture.php b/cake/tests/fixtures/tag_fixture.php
index afc205e57..036e75618 100644
--- a/cake/tests/fixtures/tag_fixture.php
+++ b/cake/tests/fixtures/tag_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/test_plugin_article_fixture.php b/cake/tests/fixtures/test_plugin_article_fixture.php
index 148fea15d..7df32099c 100644
--- a/cake/tests/fixtures/test_plugin_article_fixture.php
+++ b/cake/tests/fixtures/test_plugin_article_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/test_plugin_comment_fixture.php b/cake/tests/fixtures/test_plugin_comment_fixture.php
index 847d2ce4b..1d74823e0 100644
--- a/cake/tests/fixtures/test_plugin_comment_fixture.php
+++ b/cake/tests/fixtures/test_plugin_comment_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/the_paper_monkies_fixture.php b/cake/tests/fixtures/the_paper_monkies_fixture.php
index f8efce2db..87ef21f1f 100644
--- a/cake/tests/fixtures/the_paper_monkies_fixture.php
+++ b/cake/tests/fixtures/the_paper_monkies_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/thread_fixture.php b/cake/tests/fixtures/thread_fixture.php
index 118aa0ff2..6382968b0 100644
--- a/cake/tests/fixtures/thread_fixture.php
+++ b/cake/tests/fixtures/thread_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/translate_article_fixture.php b/cake/tests/fixtures/translate_article_fixture.php
index 549872c34..9c13a28a3 100644
--- a/cake/tests/fixtures/translate_article_fixture.php
+++ b/cake/tests/fixtures/translate_article_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/translate_fixture.php b/cake/tests/fixtures/translate_fixture.php
index 17b97a956..28539aad9 100644
--- a/cake/tests/fixtures/translate_fixture.php
+++ b/cake/tests/fixtures/translate_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/translate_table_fixture.php b/cake/tests/fixtures/translate_table_fixture.php
index 1a645e375..4ef2f8d34 100644
--- a/cake/tests/fixtures/translate_table_fixture.php
+++ b/cake/tests/fixtures/translate_table_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/translated_article_fixture.php b/cake/tests/fixtures/translated_article_fixture.php
index bce536975..7be3e78f5 100644
--- a/cake/tests/fixtures/translated_article_fixture.php
+++ b/cake/tests/fixtures/translated_article_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/translated_item_fixture.php b/cake/tests/fixtures/translated_item_fixture.php
index f8b93ce8a..37e6dbef9 100644
--- a/cake/tests/fixtures/translated_item_fixture.php
+++ b/cake/tests/fixtures/translated_item_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/unconventional_tree_fixture.php b/cake/tests/fixtures/unconventional_tree_fixture.php
index 87b517842..3685b5a2d 100644
--- a/cake/tests/fixtures/unconventional_tree_fixture.php
+++ b/cake/tests/fixtures/unconventional_tree_fixture.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/underscore_field_fixture.php b/cake/tests/fixtures/underscore_field_fixture.php
index c87ace540..f71aa2cf1 100644
--- a/cake/tests/fixtures/underscore_field_fixture.php
+++ b/cake/tests/fixtures/underscore_field_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/user_fixture.php b/cake/tests/fixtures/user_fixture.php
index bb8478034..2d34ff5ec 100644
--- a/cake/tests/fixtures/user_fixture.php
+++ b/cake/tests/fixtures/user_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/uuid_fixture.php b/cake/tests/fixtures/uuid_fixture.php
index 12a0dd99f..b0eb51be6 100644
--- a/cake/tests/fixtures/uuid_fixture.php
+++ b/cake/tests/fixtures/uuid_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/uuid_tag_fixture.php b/cake/tests/fixtures/uuid_tag_fixture.php
index 0665b4649..cb4c6203e 100644
--- a/cake/tests/fixtures/uuid_tag_fixture.php
+++ b/cake/tests/fixtures/uuid_tag_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/uuid_tree_fixture.php b/cake/tests/fixtures/uuid_tree_fixture.php
index d17ffc51c..7fa73e5d1 100644
--- a/cake/tests/fixtures/uuid_tree_fixture.php
+++ b/cake/tests/fixtures/uuid_tree_fixture.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/uuiditem_fixture.php b/cake/tests/fixtures/uuiditem_fixture.php
index bbc9b0592..540b30984 100644
--- a/cake/tests/fixtures/uuiditem_fixture.php
+++ b/cake/tests/fixtures/uuiditem_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php b/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
index c3c961282..1c22f17cb 100644
--- a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
+++ b/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php b/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
index 9938db735..c70684bfd 100644
--- a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
+++ b/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/uuidportfolio_fixture.php b/cake/tests/fixtures/uuidportfolio_fixture.php
index 96c65d978..6006e0dbc 100644
--- a/cake/tests/fixtures/uuidportfolio_fixture.php
+++ b/cake/tests/fixtures/uuidportfolio_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/groups/acl.group.php b/cake/tests/groups/acl.group.php
index 7dad05ff2..a3882d0ab 100644
--- a/cake/tests/groups/acl.group.php
+++ b/cake/tests/groups/acl.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/cache.group.php b/cake/tests/groups/cache.group.php
index 85b40cc02..4dd0d69c3 100644
--- a/cake/tests/groups/cache.group.php
+++ b/cake/tests/groups/cache.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/components.group.php b/cake/tests/groups/components.group.php
index ad4c2e538..16817efcf 100644
--- a/cake/tests/groups/components.group.php
+++ b/cake/tests/groups/components.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/configure.group.php b/cake/tests/groups/configure.group.php
index e1e8f35fd..bc0d02642 100644
--- a/cake/tests/groups/configure.group.php
+++ b/cake/tests/groups/configure.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/console.group.php b/cake/tests/groups/console.group.php
index 9cc199124..bc8f72009 100644
--- a/cake/tests/groups/console.group.php
+++ b/cake/tests/groups/console.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/controller.group.php b/cake/tests/groups/controller.group.php
index 8bbc801ac..2103124db 100644
--- a/cake/tests/groups/controller.group.php
+++ b/cake/tests/groups/controller.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/database.group.php b/cake/tests/groups/database.group.php
index b3ffa3e81..147d077a3 100644
--- a/cake/tests/groups/database.group.php
+++ b/cake/tests/groups/database.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/helpers.group.php b/cake/tests/groups/helpers.group.php
index a7dfbba70..5761386f1 100644
--- a/cake/tests/groups/helpers.group.php
+++ b/cake/tests/groups/helpers.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/lib.group.php b/cake/tests/groups/lib.group.php
index 999ba7da2..367b7ee10 100644
--- a/cake/tests/groups/lib.group.php
+++ b/cake/tests/groups/lib.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/model.group.php b/cake/tests/groups/model.group.php
index 6cf32d93a..c1e6c4ab0 100644
--- a/cake/tests/groups/model.group.php
+++ b/cake/tests/groups/model.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/no_cross_contamination.group.php b/cake/tests/groups/no_cross_contamination.group.php
index 7a72c88a3..71c0dcf8e 100644
--- a/cake/tests/groups/no_cross_contamination.group.php
+++ b/cake/tests/groups/no_cross_contamination.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/routing_system.group.php b/cake/tests/groups/routing_system.group.php
index 1afb59f12..a4b9dea60 100644
--- a/cake/tests/groups/routing_system.group.php
+++ b/cake/tests/groups/routing_system.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/socket.group.php b/cake/tests/groups/socket.group.php
index 6645dcb24..ea3a0a608 100644
--- a/cake/tests/groups/socket.group.php
+++ b/cake/tests/groups/socket.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2007, Cake Software Foundation, Inc.
+ * Copyright 2005-2010, Cake Software Foundation, Inc.
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2007, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc.
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/test_suite.group.php b/cake/tests/groups/test_suite.group.php
index bccb39955..1dae0759e 100644
--- a/cake/tests/groups/test_suite.group.php
+++ b/cake/tests/groups/test_suite.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2007, Cake Software Foundation, Inc.
+ * Copyright 2005-2010, Cake Software Foundation, Inc.
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2007, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc.
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/view.group.php b/cake/tests/groups/view.group.php
index f79efc0d2..60a7f0828 100644
--- a/cake/tests/groups/view.group.php
+++ b/cake/tests/groups/view.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/xml.group.php b/cake/tests/groups/xml.group.php
index 757153346..15a6a66e0 100644
--- a/cake/tests/groups/xml.group.php
+++ b/cake/tests/groups/xml.group.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/lib/cake_reporter.php b/cake/tests/lib/cake_reporter.php
index b5e93bf22..8e44b12b5 100644
--- a/cake/tests/lib/cake_reporter.php
+++ b/cake/tests/lib/cake_reporter.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php
index c0d0bc451..857bca729 100644
--- a/cake/tests/lib/cake_test_case.php
+++ b/cake/tests/lib/cake_test_case.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/lib/cake_test_fixture.php b/cake/tests/lib/cake_test_fixture.php
index cd12f9a32..1c2227ecc 100644
--- a/cake/tests/lib/cake_test_fixture.php
+++ b/cake/tests/lib/cake_test_fixture.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/lib/cake_test_model.php b/cake/tests/lib/cake_test_model.php
index bfc22bd2a..bf2cb68bd 100644
--- a/cake/tests/lib/cake_test_model.php
+++ b/cake/tests/lib/cake_test_model.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/lib/cake_web_test_case.php b/cake/tests/lib/cake_web_test_case.php
index b12f2e426..da5a12589 100644
--- a/cake/tests/lib/cake_web_test_case.php
+++ b/cake/tests/lib/cake_web_test_case.php
@@ -6,13 +6,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.lib
diff --git a/cake/tests/lib/cli_reporter.php b/cake/tests/lib/cli_reporter.php
index 97ceea592..7902ef998 100644
--- a/cake/tests/lib/cli_reporter.php
+++ b/cake/tests/lib/cli_reporter.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/lib/code_coverage_manager.php b/cake/tests/lib/code_coverage_manager.php
index 1000c675c..56e685526 100644
--- a/cake/tests/lib/code_coverage_manager.php
+++ b/cake/tests/lib/code_coverage_manager.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.lib
diff --git a/cake/tests/lib/content.php b/cake/tests/lib/content.php
index 8c4c9aa07..c07a96260 100644
--- a/cake/tests/lib/content.php
+++ b/cake/tests/lib/content.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.lib
diff --git a/cake/tests/lib/footer.php b/cake/tests/lib/footer.php
index 8408c75e9..5509a2719 100644
--- a/cake/tests/lib/footer.php
+++ b/cake/tests/lib/footer.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.lib
diff --git a/cake/tests/lib/header.php b/cake/tests/lib/header.php
index 1fd6d9989..6d37b39f5 100644
--- a/cake/tests/lib/header.php
+++ b/cake/tests/lib/header.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.lib
diff --git a/cake/tests/lib/simpletest.php b/cake/tests/lib/simpletest.php
index 35eb6e8cf..5a06b7a11 100644
--- a/cake/tests/lib/simpletest.php
+++ b/cake/tests/lib/simpletest.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php
index 00e540571..6f21d2f5a 100644
--- a/cake/tests/lib/test_manager.php
+++ b/cake/tests/lib/test_manager.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.lib
diff --git a/cake/tests/lib/xdebug.php b/cake/tests/lib/xdebug.php
index b285e700d..f954f5600 100644
--- a/cake/tests/lib/xdebug.php
+++ b/cake/tests/lib/xdebug.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/test_app/config/acl.ini.php b/cake/tests/test_app/config/acl.ini.php
index 9ac2b5d60..b7b95abcd 100644
--- a/cake/tests/test_app/config/acl.ini.php
+++ b/cake/tests/test_app/config/acl.ini.php
@@ -7,13 +7,13 @@
 ; * PHP versions 4 and 5
 ; *
 ; * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
-; * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+; * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
 ; *
 ; *  Licensed under The MIT License
 ; *  Redistributions of files must retain the above copyright notice.
 ; *
 ; * @filesource
-; * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
 ; * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
 ; * @package       cake
 ; * @subpackage    cake.app.config
diff --git a/cake/tests/test_app/controllers/tests_apps_controller.php b/cake/tests/test_app/controllers/tests_apps_controller.php
index 4800490f5..1eac7d061 100644
--- a/cake/tests/test_app/controllers/tests_apps_controller.php
+++ b/cake/tests/test_app/controllers/tests_apps_controller.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/controllers/tests_apps_posts_controller.php b/cake/tests/test_app/controllers/tests_apps_posts_controller.php
index c8ef7953f..1634b1b5c 100644
--- a/cake/tests/test_app/controllers/tests_apps_posts_controller.php
+++ b/cake/tests/test_app/controllers/tests_apps_posts_controller.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/models/behaviors/persister_one_behavior.php b/cake/tests/test_app/models/behaviors/persister_one_behavior.php
index 63f5998a6..e41957460 100644
--- a/cake/tests/test_app/models/behaviors/persister_one_behavior.php
+++ b/cake/tests/test_app/models/behaviors/persister_one_behavior.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.tests.test_app.models
diff --git a/cake/tests/test_app/models/behaviors/persister_two_behavior.php b/cake/tests/test_app/models/behaviors/persister_two_behavior.php
index c032fc3e2..cebd79858 100644
--- a/cake/tests/test_app/models/behaviors/persister_two_behavior.php
+++ b/cake/tests/test_app/models/behaviors/persister_two_behavior.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.tests.test_app.models
diff --git a/cake/tests/test_app/models/comment.php b/cake/tests/test_app/models/comment.php
index 75c1450a5..5eb6eba63 100644
--- a/cake/tests/test_app/models/comment.php
+++ b/cake/tests/test_app/models/comment.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.
diff --git a/cake/tests/test_app/models/persister_one.php b/cake/tests/test_app/models/persister_one.php
index 37fd2b4ef..6f0fbf48d 100644
--- a/cake/tests/test_app/models/persister_one.php
+++ b/cake/tests/test_app/models/persister_one.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.test_app.models
diff --git a/cake/tests/test_app/models/persister_two.php b/cake/tests/test_app/models/persister_two.php
index 36d2423da..0fb3ceb65 100644
--- a/cake/tests/test_app/models/persister_two.php
+++ b/cake/tests/test_app/models/persister_two.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.test_app.models
diff --git a/cake/tests/test_app/models/post.php b/cake/tests/test_app/models/post.php
index f2ea630d6..71280e0db 100644
--- a/cake/tests/test_app/models/post.php
+++ b/cake/tests/test_app/models/post.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
index ab3cb7b22..8c8c6269b 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
index 6a80527d9..d66e4eb3c 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
index 23a462bf9..3d98a2961 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
index 560e0702f..321831152 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php b/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
index 565a4cd9a..10e43fa0a 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
index 5530fd286..7ffe580ed 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.tests.test_app.models
diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
index 89f2def32..0d5eb05fb 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.tests.test_app.models
diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
index 52c8a35e3..b72cd1eb0 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2006-2008, Cake Software Foundation, Inc.
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.tests.test_app.plugins.test_plugin
diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
index 56ad96b9c..46a40ecb0 100644
--- a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
+++ b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
index b6510715b..1ce17fe7e 100644
--- a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
+++ b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php b/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
index d4152137e..f263537c6 100644
--- a/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
+++ b/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.vendors.sample
diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php b/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
index d363e9217..e4f71f8ba 100644
--- a/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
+++ b/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.vendors.shells
diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php b/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
index b5122b327..e116ba975 100644
--- a/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
+++ b/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.vendors
diff --git a/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php b/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
index 9ec662708..952a42824 100644
--- a/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
+++ b/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php b/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
index 084eee80e..7611e129f 100644
--- a/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
+++ b/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
index 9e4b23fd3..f4e0635e5 100644
--- a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
+++ b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin_two.vendors.shells
diff --git a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
index 57f09f3ee..5fb0dde2b 100644
--- a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
+++ b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin_two.vendors.shells
diff --git a/cake/tests/test_app/vendors/Test/MyTest.php b/cake/tests/test_app/vendors/Test/MyTest.php
index 2705dffc2..7662a2d88 100644
--- a/cake/tests/test_app/vendors/Test/MyTest.php
+++ b/cake/tests/test_app/vendors/Test/MyTest.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.vendors.somename
diff --git a/cake/tests/test_app/vendors/Test/hello.php b/cake/tests/test_app/vendors/Test/hello.php
index d96fa7047..061237d5f 100644
--- a/cake/tests/test_app/vendors/Test/hello.php
+++ b/cake/tests/test_app/vendors/Test/hello.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.vendors.Test
diff --git a/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php b/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
index 252c860d7..1776b67b0 100644
--- a/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
+++ b/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.vendors.sample
diff --git a/cake/tests/test_app/vendors/shells/sample.php b/cake/tests/test_app/vendors/shells/sample.php
index 738c57911..474a855ad 100644
--- a/cake/tests/test_app/vendors/shells/sample.php
+++ b/cake/tests/test_app/vendors/shells/sample.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.vendors.shells
diff --git a/cake/tests/test_app/vendors/somename/some.name.php b/cake/tests/test_app/vendors/somename/some.name.php
index 442fabcd0..4507ebb35 100644
--- a/cake/tests/test_app/vendors/somename/some.name.php
+++ b/cake/tests/test_app/vendors/somename/some.name.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.vendors.somename
diff --git a/cake/tests/test_app/vendors/welcome.php b/cake/tests/test_app/vendors/welcome.php
index edb18261b..25abe89a6 100644
--- a/cake/tests/test_app/vendors/welcome.php
+++ b/cake/tests/test_app/vendors/welcome.php
@@ -8,13 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.vendors
diff --git a/cake/tests/test_app/views/elements/email/html/default.ctp b/cake/tests/test_app/views/elements/email/html/default.ctp
index 35146fe4a..374923ef3 100644
--- a/cake/tests/test_app/views/elements/email/html/default.ctp
+++ b/cake/tests/test_app/views/elements/email/html/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements.email.html
diff --git a/cake/tests/test_app/views/elements/email/text/default.ctp b/cake/tests/test_app/views/elements/email/text/default.ctp
index cbb261c64..284acea16 100644
--- a/cake/tests/test_app/views/elements/email/text/default.ctp
+++ b/cake/tests/test_app/views/elements/email/text/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements.email.text
diff --git a/cake/tests/test_app/views/elements/email/text/wide.ctp b/cake/tests/test_app/views/elements/email/text/wide.ctp
index f2ee2792d..d9365aa06 100644
--- a/cake/tests/test_app/views/elements/email/text/wide.ctp
+++ b/cake/tests/test_app/views/elements/email/text/wide.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements.email.text
diff --git a/cake/tests/test_app/views/layouts/ajax.ctp b/cake/tests/test_app/views/layouts/ajax.ctp
index ca3459af8..e6bd065e0 100644
--- a/cake/tests/test_app/views/layouts/ajax.ctp
+++ b/cake/tests/test_app/views/layouts/ajax.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
diff --git a/cake/tests/test_app/views/layouts/ajax2.ctp b/cake/tests/test_app/views/layouts/ajax2.ctp
index 060d614a6..c975fdfe2 100644
--- a/cake/tests/test_app/views/layouts/ajax2.ctp
+++ b/cake/tests/test_app/views/layouts/ajax2.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
diff --git a/cake/tests/test_app/views/layouts/cache_layout.ctp b/cake/tests/test_app/views/layouts/cache_layout.ctp
index dee02a716..ae9a16593 100644
--- a/cake/tests/test_app/views/layouts/cache_layout.ctp
+++ b/cake/tests/test_app/views/layouts/cache_layout.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
diff --git a/cake/tests/test_app/views/layouts/default.ctp b/cake/tests/test_app/views/layouts/default.ctp
index bf0d3f30c..50e5c0300 100644
--- a/cake/tests/test_app/views/layouts/default.ctp
+++ b/cake/tests/test_app/views/layouts/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.pages
diff --git a/cake/tests/test_app/views/layouts/email/html/default.ctp b/cake/tests/test_app/views/layouts/email/html/default.ctp
index 1853a7b3a..63573ac05 100644
--- a/cake/tests/test_app/views/layouts/email/html/default.ctp
+++ b/cake/tests/test_app/views/layouts/email/html/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts.email.html
diff --git a/cake/tests/test_app/views/layouts/email/html/thin.ctp b/cake/tests/test_app/views/layouts/email/html/thin.ctp
index 2cd9e4020..f568046be 100644
--- a/cake/tests/test_app/views/layouts/email/html/thin.ctp
+++ b/cake/tests/test_app/views/layouts/email/html/thin.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts.email.html
diff --git a/cake/tests/test_app/views/layouts/email/text/default.ctp b/cake/tests/test_app/views/layouts/email/text/default.ctp
index 77fda3bd6..9a0cf7835 100644
--- a/cake/tests/test_app/views/layouts/email/text/default.ctp
+++ b/cake/tests/test_app/views/layouts/email/text/default.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts.email.text
diff --git a/cake/tests/test_app/views/layouts/flash.ctp b/cake/tests/test_app/views/layouts/flash.ctp
index 95fc61fb8..3f17a4764 100644
--- a/cake/tests/test_app/views/layouts/flash.ctp
+++ b/cake/tests/test_app/views/layouts/flash.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
diff --git a/cake/tests/test_app/views/layouts/multi_cache.ctp b/cake/tests/test_app/views/layouts/multi_cache.ctp
index 7c07d9be5..658537659 100644
--- a/cake/tests/test_app/views/layouts/multi_cache.ctp
+++ b/cake/tests/test_app/views/layouts/multi_cache.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
diff --git a/cake/tests/test_app/views/posts/sequencial_nocache.ctp b/cake/tests/test_app/views/posts/sequencial_nocache.ctp
index 247be625f..b0b8d556f 100644
--- a/cake/tests/test_app/views/posts/sequencial_nocache.ctp
+++ b/cake/tests/test_app/views/posts/sequencial_nocache.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.pages
diff --git a/cake/tests/test_app/views/posts/test_nocache_tags.ctp b/cake/tests/test_app/views/posts/test_nocache_tags.ctp
index db0e7397c..9dd64d8cb 100644
--- a/cake/tests/test_app/views/posts/test_nocache_tags.ctp
+++ b/cake/tests/test_app/views/posts/test_nocache_tags.ctp
@@ -5,13 +5,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.pages
diff --git a/index.php b/index.php
index c6a3a1b18..de5df8cfc 100644
--- a/index.php
+++ b/index.php
@@ -10,13 +10,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
  * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
  * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
  * @package       cake
  * @since         CakePHP(tm) v 0.2.9

From 5c47d8dd7acd36364284a2a87b8f32c0022702a6 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Thu, 14 Jan 2010 20:15:54 -0500
Subject: [PATCH 158/244] Trimming trailing whitespace from files. Refs #201

---
 cake/config/config.php                        |  2 +-
 cake/console/libs/console.php                 |  2 +-
 cake/console/libs/tasks/controller.php        |  2 +-
 cake/libs/cache/memcache.php                  |  2 +-
 cake/libs/controller/controller.php           |  2 +-
 cake/libs/model/connection_manager.php        |  2 +-
 cake/libs/multibyte.php                       | 32 +++++++++----------
 cake/libs/sanitize.php                        |  2 +-
 cake/libs/validation.php                      |  2 +-
 cake/libs/view/helpers/paginator.php          |  2 +-
 .../libs/controller/components/auth.test.php  |  2 +-
 cake/tests/cases/libs/folder.test.php         |  2 +-
 .../libs/model/behaviors/containable.test.php |  2 +-
 cake/tests/fixtures/aco_action_fixture.php    |  2 +-
 cake/tests/fixtures/advertisement_fixture.php |  2 +-
 .../fixtures/another_article_fixture.php      |  2 +-
 cake/tests/fixtures/apple_fixture.php         |  2 +-
 cake/tests/fixtures/aro_fixture.php           |  2 +-
 cake/tests/fixtures/aro_two_fixture.php       |  2 +-
 cake/tests/fixtures/aros_aco_fixture.php      |  2 +-
 cake/tests/fixtures/aros_aco_two_fixture.php  |  2 +-
 .../fixtures/article_featured_fixture.php     |  2 +-
 .../article_featureds_tags_fixture.php        |  2 +-
 cake/tests/fixtures/article_fixture.php       |  2 +-
 cake/tests/fixtures/articles_tag_fixture.php  |  2 +-
 cake/tests/fixtures/attachment_fixture.php    |  2 +-
 .../auth_user_custom_field_fixture.php        |  2 +-
 cake/tests/fixtures/auth_user_fixture.php     |  2 +-
 cake/tests/fixtures/author_fixture.php        |  2 +-
 cake/tests/fixtures/bid_fixture.php           |  2 +-
 cake/tests/fixtures/binary_test_fixture.php   |  2 +-
 .../fixtures/cache_test_model_fixture.php     |  2 +-
 cake/tests/fixtures/callback_fixture.php      |  2 +-
 cake/tests/fixtures/category_fixture.php      |  2 +-
 .../fixtures/category_thread_fixture.php      |  2 +-
 cake/tests/fixtures/comment_fixture.php       |  2 +-
 cake/tests/fixtures/data_test_fixture.php     |  2 +-
 cake/tests/fixtures/datatype_fixture.php      |  2 +-
 cake/tests/fixtures/dependency_fixture.php    |  2 +-
 cake/tests/fixtures/device_fixture.php        |  2 +-
 .../fixtures/device_type_category_fixture.php |  2 +-
 cake/tests/fixtures/device_type_fixture.php   |  2 +-
 .../fixtures/document_directory_fixture.php   |  2 +-
 cake/tests/fixtures/document_fixture.php      |  2 +-
 .../exterior_type_category_fixture.php        |  2 +-
 cake/tests/fixtures/feature_set_fixture.php   |  2 +-
 cake/tests/fixtures/featured_fixture.php      |  2 +-
 cake/tests/fixtures/flag_tree_fixture.php     |  2 +-
 cake/tests/fixtures/home_fixture.php          |  2 +-
 cake/tests/fixtures/image_fixture.php         |  2 +-
 cake/tests/fixtures/item_fixture.php          |  2 +-
 .../fixtures/items_portfolio_fixture.php      |  2 +-
 cake/tests/fixtures/join_a_b_fixture.php      |  2 +-
 cake/tests/fixtures/join_a_c_fixture.php      |  2 +-
 cake/tests/fixtures/join_a_fixture.php        |  2 +-
 cake/tests/fixtures/join_b_fixture.php        |  2 +-
 cake/tests/fixtures/join_c_fixture.php        |  2 +-
 cake/tests/fixtures/join_thing_fixture.php    |  2 +-
 cake/tests/fixtures/message_fixture.php       |  2 +-
 cake/tests/fixtures/my_product_fixture.php    |  2 +-
 cake/tests/fixtures/node_fixture.php          |  2 +-
 cake/tests/fixtures/number_tree_fixture.php   |  2 +-
 .../fixtures/numeric_article_fixture.php      |  2 +-
 cake/tests/fixtures/person_fixture.php        |  2 +-
 cake/tests/fixtures/portfolio_fixture.php     |  2 +-
 cake/tests/fixtures/post_fixture.php          |  2 +-
 cake/tests/fixtures/posts_tag_fixture.php     |  2 +-
 cake/tests/fixtures/primary_model_fixture.php |  2 +-
 cake/tests/fixtures/project_fixture.php       |  2 +-
 .../fixtures/secondary_model_fixture.php      |  2 +-
 cake/tests/fixtures/session_fixture.php       |  2 +-
 .../tests/fixtures/something_else_fixture.php |  2 +-
 cake/tests/fixtures/something_fixture.php     |  2 +-
 cake/tests/fixtures/stories_tag_fixture.php   |  2 +-
 cake/tests/fixtures/story_fixture.php         |  2 +-
 cake/tests/fixtures/syfile_fixture.php        |  2 +-
 cake/tests/fixtures/tag_fixture.php           |  2 +-
 .../fixtures/test_plugin_article_fixture.php  |  2 +-
 .../fixtures/test_plugin_comment_fixture.php  |  2 +-
 .../fixtures/the_paper_monkies_fixture.php    |  2 +-
 cake/tests/fixtures/thread_fixture.php        |  2 +-
 .../fixtures/translate_article_fixture.php    |  2 +-
 .../fixtures/translate_table_fixture.php      |  2 +-
 .../fixtures/translated_article_fixture.php   |  2 +-
 .../fixtures/translated_item_fixture.php      |  2 +-
 .../fixtures/underscore_field_fixture.php     |  2 +-
 cake/tests/fixtures/user_fixture.php          |  2 +-
 cake/tests/fixtures/uuid_fixture.php          |  2 +-
 cake/tests/groups/controller.group.php        |  2 +-
 89 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/cake/config/config.php b/cake/config/config.php
index baecc26de..fd3d4de16 100644
--- a/cake/config/config.php
+++ b/cake/config/config.php
@@ -23,4 +23,4 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 return $config['Cake.version'] = '1.2.5';
-?>
+?>
\ No newline at end of file
diff --git a/cake/console/libs/console.php b/cake/console/libs/console.php
index 189da32e8..b6a350dc3 100644
--- a/cake/console/libs/console.php
+++ b/cake/console/libs/console.php
@@ -335,4 +335,4 @@ function __loadRoutes() {
 		return true;
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index d4ab58abe..53aa8a627 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -582,4 +582,4 @@ function help() {
 		$this->_stop();
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php
index 4c87c10c2..64b80f373 100644
--- a/cake/libs/cache/memcache.php
+++ b/cake/libs/cache/memcache.php
@@ -160,4 +160,4 @@ function connect($host, $port = 11211) {
 		return true;
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index f47a5eec5..2c3fde9d2 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -1182,4 +1182,4 @@ function _scaffoldError($method) {
 		return false;
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php
index a0db47226..5987b535e 100644
--- a/cake/libs/model/connection_manager.php
+++ b/cake/libs/model/connection_manager.php
@@ -262,4 +262,4 @@ function __destruct() {
 		}
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/multibyte.php b/cake/libs/multibyte.php
index 1dfcd456b..f7e76465e 100644
--- a/cake/libs/multibyte.php
+++ b/cake/libs/multibyte.php
@@ -36,7 +36,7 @@
  * @param string $needle The string to find in $haystack.
  * @param integer $offset The position in $haystack to start searching.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string, or false 
+ * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string, or false
  *    if $needle is not found.
  */
 if (!function_exists('mb_stripos')) {
@@ -51,7 +51,7 @@ function mb_stripos($haystack, $needle, $offset = 0, $encoding = null) {
  * @param string $needle The string to find in $haystack.
  * @param boolean $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
- *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end, 
+ *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
  * @return string|boolean The portion of $haystack, or false if $needle is not found.
@@ -96,7 +96,7 @@ function mb_strpos($haystack, $needle, $offset = 0, $encoding = null) {
  * @param string $needle The string to find in $haystack.
  * @param boolean $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
- *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end, 
+ *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
  * @return string|boolean The portion of $haystack. or false if $needle is not found.
@@ -113,7 +113,7 @@ function mb_strrchr($haystack, $needle, $part = false, $encoding = null) {
  * @param string $needle The string to find in $haystack.
  * @param boolean $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
- *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end, 
+ *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
  * @return string|boolean The portion of $haystack. or false if $needle is not found.
@@ -130,7 +130,7 @@ function mb_strrichr($haystack, $needle, $part = false, $encoding = null) {
  * @param string $needle The string to find in $haystack.
  * @param integer $offset The position in $haystack to start searching.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string, 
+ * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string,
  *    or false if $needle is not found.
  */
 if (!function_exists('mb_strripos')) {
@@ -146,7 +146,7 @@ function mb_strripos($haystack, $needle, $offset = 0, $encoding = null) {
  * @param integer $offset May be specified to begin searching an arbitrary number of characters into the string.
  *    Negative values will stop searching at an arbitrary point prior to the end of the string.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string. 
+ * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string.
  *    If $needle is not found, it returns false.
  */
 if (!function_exists('mb_strrpos')) {
@@ -161,7 +161,7 @@ function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null) {
  * @param string $needle The string to find in $haystack
  * @param boolean $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
- *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end, 
+ *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is FALSE.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
  * @return string|boolean The portion of $haystack, or true if $needle is not found.
@@ -228,9 +228,9 @@ function mb_substr($string, $start, $length = null, $encoding = null) {
  * @param string $str The string being encoded
  * @param string $charset specifies the name of the character set in which str is represented in.
  *    The default value is determined by the current NLS setting (mbstring.language).
- * @param string $transfer_encoding specifies the scheme of MIME encoding. 
+ * @param string $transfer_encoding specifies the scheme of MIME encoding.
  *    It should be either "B" (Base64) or "Q" (Quoted-Printable). Falls back to "B" if not given.
- * @param string $linefeed specifies the EOL (end-of-line) marker with which 
+ * @param string $linefeed specifies the EOL (end-of-line) marker with which
  *    mb_encode_mimeheader() performs line-folding
  *    (a » RFC term, the act of breaking a line longer than a certain length into multiple lines.
  *    The length is currently hard-coded to 74 characters). Falls back to "\r\n" (CRLF) if not given.
@@ -358,7 +358,7 @@ function ascii($array) {
  * @param multi-byte string $haystack The string from which to get the position of the first occurrence of $needle.
  * @param multi-byte string $needle The string to find in $haystack.
  * @param integer $offset The position in $haystack to start searching.
- * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string, 
+ * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string,
  *    or false if $needle is not found.
  * @access public
  * @static
@@ -378,7 +378,7 @@ function stripos($haystack, $needle, $offset = 0) {
  * @param string $needle The string to find in $haystack.
  * @param boolean $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
- *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end, 
+ *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is false.
  * @return int|boolean The portion of $haystack, or false if $needle is not found.
  * @access public
@@ -560,7 +560,7 @@ function strrchr($haystack, $needle, $part = false) {
  * @param string $needle The string to find in $haystack.
  * @param boolean $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
- *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end, 
+ *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
  * @return string|boolean The portion of $haystack. or false if $needle is not found.
  * @access public
@@ -622,7 +622,7 @@ function strrichr($haystack, $needle, $part = false) {
  * @param string $haystack The string from which to get the position of the last occurrence of $needle.
  * @param string $needle The string to find in $haystack.
  * @param integer $offset The position in $haystack to start searching.
- * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string, 
+ * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string,
  *    or false if $needle is not found.
  * @access public
  * @static
@@ -675,7 +675,7 @@ function strripos($haystack, $needle, $offset = 0) {
  * @param string $needle The string to find in $haystack.
  * @param integer $offset May be specified to begin searching an arbitrary number of characters into the string.
  *    Negative values will stop searching at an arbitrary point prior to the end of the string.
- * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string. 
+ * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string.
  *    If $needle is not found, it returns false.
  * @access public
  * @static
@@ -726,7 +726,7 @@ function strrpos($haystack, $needle, $offset = 0) {
  * @param string $needle The string to find in $haystack
  * @param boolean $part Determines which portion of $haystack this function returns.
  *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
- *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end, 
+ *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is FALSE.
  * @return string|boolean The portion of $haystack, or true if $needle is not found.
  * @access public
@@ -1138,4 +1138,4 @@ function checkMultibyte($string) {
 		return false;
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/sanitize.php b/cake/libs/sanitize.php
index 8ed84a455..caaa2807d 100644
--- a/cake/libs/sanitize.php
+++ b/cake/libs/sanitize.php
@@ -305,4 +305,4 @@ function formatColumns(&$model) {
 		}
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index 22a1d1f62..060e42f7b 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -926,4 +926,4 @@ function __reset() {
 		$this->errors = array();
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 9fa185ddc..db2857bd8 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -703,4 +703,4 @@ function last($last = 'last >>', $options = array()) {
 		return $out;
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php
index 481b2dd5f..51825db08 100644
--- a/cake/tests/cases/libs/controller/components/auth.test.php
+++ b/cake/tests/cases/libs/controller/components/auth.test.php
@@ -1263,4 +1263,4 @@ function testShutDown() {
 		$this->assertFalse($this->Controller->Session->read('Auth.redirect'));
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/folder.test.php b/cake/tests/cases/libs/folder.test.php
index 0793630c2..057392fc5 100644
--- a/cake/tests/cases/libs/folder.test.php
+++ b/cake/tests/cases/libs/folder.test.php
@@ -715,4 +715,4 @@ function testMove() {
 		$Folder->delete();
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index d5ae197c8..fc1cb8f6f 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -3571,4 +3571,4 @@ function __bindings(&$Model, $extra = array(), $output = true) {
 		return $debug;
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/aco_action_fixture.php b/cake/tests/fixtures/aco_action_fixture.php
index 2c35d5fe6..956dac6f2 100644
--- a/cake/tests/fixtures/aco_action_fixture.php
+++ b/cake/tests/fixtures/aco_action_fixture.php
@@ -62,4 +62,4 @@ class AcoActionFixture extends CakeTestFixture {
 	var $records = array();
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/advertisement_fixture.php b/cake/tests/fixtures/advertisement_fixture.php
index f5062336a..c01a75049 100644
--- a/cake/tests/fixtures/advertisement_fixture.php
+++ b/cake/tests/fixtures/advertisement_fixture.php
@@ -62,4 +62,4 @@ class AdvertisementFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/another_article_fixture.php b/cake/tests/fixtures/another_article_fixture.php
index ec3d19c0c..8a34c33b8 100644
--- a/cake/tests/fixtures/another_article_fixture.php
+++ b/cake/tests/fixtures/another_article_fixture.php
@@ -63,4 +63,4 @@ class AnotherArticleFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/apple_fixture.php b/cake/tests/fixtures/apple_fixture.php
index d8d3e1250..2b58510fc 100644
--- a/cake/tests/fixtures/apple_fixture.php
+++ b/cake/tests/fixtures/apple_fixture.php
@@ -71,4 +71,4 @@ class AppleFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/aro_fixture.php b/cake/tests/fixtures/aro_fixture.php
index 26180de0e..1c4ea9a68 100644
--- a/cake/tests/fixtures/aro_fixture.php
+++ b/cake/tests/fixtures/aro_fixture.php
@@ -67,4 +67,4 @@ class AroFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/aro_two_fixture.php b/cake/tests/fixtures/aro_two_fixture.php
index 8d2337bc5..f02728ddc 100644
--- a/cake/tests/fixtures/aro_two_fixture.php
+++ b/cake/tests/fixtures/aro_two_fixture.php
@@ -73,4 +73,4 @@ class AroTwoFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/aros_aco_fixture.php b/cake/tests/fixtures/aros_aco_fixture.php
index be181c6fb..357bcf0b6 100644
--- a/cake/tests/fixtures/aros_aco_fixture.php
+++ b/cake/tests/fixtures/aros_aco_fixture.php
@@ -62,4 +62,4 @@ class ArosAcoFixture extends CakeTestFixture {
 	var $records = array();
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/aros_aco_two_fixture.php b/cake/tests/fixtures/aros_aco_two_fixture.php
index 74866e5fe..2cca76c53 100644
--- a/cake/tests/fixtures/aros_aco_two_fixture.php
+++ b/cake/tests/fixtures/aros_aco_two_fixture.php
@@ -83,4 +83,4 @@ class ArosAcoTwoFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/article_featured_fixture.php b/cake/tests/fixtures/article_featured_fixture.php
index 67b967499..134e2445e 100644
--- a/cake/tests/fixtures/article_featured_fixture.php
+++ b/cake/tests/fixtures/article_featured_fixture.php
@@ -66,4 +66,4 @@ class ArticleFeaturedFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/article_featureds_tags_fixture.php b/cake/tests/fixtures/article_featureds_tags_fixture.php
index e1ac130f6..bc369892a 100644
--- a/cake/tests/fixtures/article_featureds_tags_fixture.php
+++ b/cake/tests/fixtures/article_featureds_tags_fixture.php
@@ -51,4 +51,4 @@ class ArticleFeaturedsTagsFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/article_fixture.php b/cake/tests/fixtures/article_fixture.php
index fe2721d74..18d0cddeb 100644
--- a/cake/tests/fixtures/article_fixture.php
+++ b/cake/tests/fixtures/article_fixture.php
@@ -66,4 +66,4 @@ class ArticleFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/articles_tag_fixture.php b/cake/tests/fixtures/articles_tag_fixture.php
index a19bcd142..cdd32fa35 100644
--- a/cake/tests/fixtures/articles_tag_fixture.php
+++ b/cake/tests/fixtures/articles_tag_fixture.php
@@ -63,4 +63,4 @@ class ArticlesTagFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/attachment_fixture.php b/cake/tests/fixtures/attachment_fixture.php
index de0d8b492..47e1325bf 100644
--- a/cake/tests/fixtures/attachment_fixture.php
+++ b/cake/tests/fixtures/attachment_fixture.php
@@ -62,4 +62,4 @@ class AttachmentFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/auth_user_custom_field_fixture.php b/cake/tests/fixtures/auth_user_custom_field_fixture.php
index ebc2c3f29..14d2919fc 100644
--- a/cake/tests/fixtures/auth_user_custom_field_fixture.php
+++ b/cake/tests/fixtures/auth_user_custom_field_fixture.php
@@ -67,4 +67,4 @@ class AuthUserCustomFieldFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/auth_user_fixture.php b/cake/tests/fixtures/auth_user_fixture.php
index d16c7759e..033909a92 100644
--- a/cake/tests/fixtures/auth_user_fixture.php
+++ b/cake/tests/fixtures/auth_user_fixture.php
@@ -67,4 +67,4 @@ class AuthUserFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/author_fixture.php b/cake/tests/fixtures/author_fixture.php
index 96ee0ea44..464a5bdbf 100644
--- a/cake/tests/fixtures/author_fixture.php
+++ b/cake/tests/fixtures/author_fixture.php
@@ -65,4 +65,4 @@ class AuthorFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/bid_fixture.php b/cake/tests/fixtures/bid_fixture.php
index 9b118cca8..7c981ec1b 100644
--- a/cake/tests/fixtures/bid_fixture.php
+++ b/cake/tests/fixtures/bid_fixture.php
@@ -63,4 +63,4 @@ class BidFixture extends CakeTestFixture {
 		array('message_id' => 2, 'name' => 'Bid 2.2')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/binary_test_fixture.php b/cake/tests/fixtures/binary_test_fixture.php
index b9c09cbe2..dc7f82ab9 100644
--- a/cake/tests/fixtures/binary_test_fixture.php
+++ b/cake/tests/fixtures/binary_test_fixture.php
@@ -57,4 +57,4 @@ class BinaryTestFixture extends CakeTestFixture {
 	var $records = array();
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/cache_test_model_fixture.php b/cake/tests/fixtures/cache_test_model_fixture.php
index ff4f855c0..e2cac8758 100644
--- a/cake/tests/fixtures/cache_test_model_fixture.php
+++ b/cake/tests/fixtures/cache_test_model_fixture.php
@@ -51,4 +51,4 @@ class CacheTestModelFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/callback_fixture.php b/cake/tests/fixtures/callback_fixture.php
index 6ef3d1eb5..b047898c2 100644
--- a/cake/tests/fixtures/callback_fixture.php
+++ b/cake/tests/fixtures/callback_fixture.php
@@ -64,4 +64,4 @@ class CallbackFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/category_fixture.php b/cake/tests/fixtures/category_fixture.php
index 5cb04f106..2343545af 100644
--- a/cake/tests/fixtures/category_fixture.php
+++ b/cake/tests/fixtures/category_fixture.php
@@ -69,4 +69,4 @@ class CategoryFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/category_thread_fixture.php b/cake/tests/fixtures/category_thread_fixture.php
index 5da10d7d8..c58b7584d 100644
--- a/cake/tests/fixtures/category_thread_fixture.php
+++ b/cake/tests/fixtures/category_thread_fixture.php
@@ -68,4 +68,4 @@ class CategoryThreadFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/comment_fixture.php b/cake/tests/fixtures/comment_fixture.php
index b2283c9af..065c015b1 100644
--- a/cake/tests/fixtures/comment_fixture.php
+++ b/cake/tests/fixtures/comment_fixture.php
@@ -69,4 +69,4 @@ class CommentFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/data_test_fixture.php b/cake/tests/fixtures/data_test_fixture.php
index afed9aa9b..e3dd8f9f5 100644
--- a/cake/tests/fixtures/data_test_fixture.php
+++ b/cake/tests/fixtures/data_test_fixture.php
@@ -61,4 +61,4 @@ class DataTestFixture extends CakeTestFixture {
 	var $records = array();
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/datatype_fixture.php b/cake/tests/fixtures/datatype_fixture.php
index 281da2f48..5a5781ae2 100644
--- a/cake/tests/fixtures/datatype_fixture.php
+++ b/cake/tests/fixtures/datatype_fixture.php
@@ -59,4 +59,4 @@ class DatatypeFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/dependency_fixture.php b/cake/tests/fixtures/dependency_fixture.php
index 8b1720798..155fe9639 100644
--- a/cake/tests/fixtures/dependency_fixture.php
+++ b/cake/tests/fixtures/dependency_fixture.php
@@ -62,4 +62,4 @@ class DependencyFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/device_fixture.php b/cake/tests/fixtures/device_fixture.php
index 3b0638d15..94bba1ea2 100644
--- a/cake/tests/fixtures/device_fixture.php
+++ b/cake/tests/fixtures/device_fixture.php
@@ -62,4 +62,4 @@ class DeviceFixture extends CakeTestFixture {
 		array('device_type_id' => 1, 'name' => 'Device 3', 'typ' => 2)
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/device_type_category_fixture.php b/cake/tests/fixtures/device_type_category_fixture.php
index ee33c18b2..1bf658a8e 100644
--- a/cake/tests/fixtures/device_type_category_fixture.php
+++ b/cake/tests/fixtures/device_type_category_fixture.php
@@ -58,4 +58,4 @@ class DeviceTypeCategoryFixture extends CakeTestFixture {
 		array('name' => 'DeviceTypeCategory 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/device_type_fixture.php b/cake/tests/fixtures/device_type_fixture.php
index cb8970a57..76f63d55e 100644
--- a/cake/tests/fixtures/device_type_fixture.php
+++ b/cake/tests/fixtures/device_type_fixture.php
@@ -65,4 +65,4 @@ class DeviceTypeFixture extends CakeTestFixture {
 		array('device_type_category_id' => 1, 'feature_set_id' => 1, 'exterior_type_category_id' => 1, 'image_id' => 1, 'extra1_id' => 1, 'extra2_id' => 1, 'name' => 'DeviceType 1', 'order' => 0)
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/document_directory_fixture.php b/cake/tests/fixtures/document_directory_fixture.php
index ff67dfa47..48c2c3625 100644
--- a/cake/tests/fixtures/document_directory_fixture.php
+++ b/cake/tests/fixtures/document_directory_fixture.php
@@ -58,4 +58,4 @@ class DocumentDirectoryFixture extends CakeTestFixture {
 		array('name' => 'DocumentDirectory 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/document_fixture.php b/cake/tests/fixtures/document_fixture.php
index fde15f92d..41077b84c 100644
--- a/cake/tests/fixtures/document_fixture.php
+++ b/cake/tests/fixtures/document_fixture.php
@@ -59,4 +59,4 @@ class DocumentFixture extends CakeTestFixture {
 		array('document_directory_id' => 1, 'name' => 'Document 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/exterior_type_category_fixture.php b/cake/tests/fixtures/exterior_type_category_fixture.php
index 0905c3eca..cff6e90bf 100644
--- a/cake/tests/fixtures/exterior_type_category_fixture.php
+++ b/cake/tests/fixtures/exterior_type_category_fixture.php
@@ -59,4 +59,4 @@ class ExteriorTypeCategoryFixture extends CakeTestFixture {
 		array('image_id' => 1, 'name' => 'ExteriorTypeCategory 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/feature_set_fixture.php b/cake/tests/fixtures/feature_set_fixture.php
index 533601535..68b970a81 100644
--- a/cake/tests/fixtures/feature_set_fixture.php
+++ b/cake/tests/fixtures/feature_set_fixture.php
@@ -58,4 +58,4 @@ class FeatureSetFixture extends CakeTestFixture {
 		array('name' => 'FeatureSet 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/featured_fixture.php b/cake/tests/fixtures/featured_fixture.php
index 3f3e83372..446b4fa00 100644
--- a/cake/tests/fixtures/featured_fixture.php
+++ b/cake/tests/fixtures/featured_fixture.php
@@ -65,4 +65,4 @@ class FeaturedFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/flag_tree_fixture.php b/cake/tests/fixtures/flag_tree_fixture.php
index d81744261..f059f2bb9 100644
--- a/cake/tests/fixtures/flag_tree_fixture.php
+++ b/cake/tests/fixtures/flag_tree_fixture.php
@@ -56,4 +56,4 @@ class FlagTreeFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/home_fixture.php b/cake/tests/fixtures/home_fixture.php
index f88b8f7b0..88aa97ef3 100644
--- a/cake/tests/fixtures/home_fixture.php
+++ b/cake/tests/fixtures/home_fixture.php
@@ -64,4 +64,4 @@ class HomeFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/image_fixture.php b/cake/tests/fixtures/image_fixture.php
index e30862fc9..3a64666ef 100644
--- a/cake/tests/fixtures/image_fixture.php
+++ b/cake/tests/fixtures/image_fixture.php
@@ -62,4 +62,4 @@ class ImageFixture extends CakeTestFixture {
 		array('name' => 'Image 5')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/item_fixture.php b/cake/tests/fixtures/item_fixture.php
index 1602fb698..f8dcaf566 100644
--- a/cake/tests/fixtures/item_fixture.php
+++ b/cake/tests/fixtures/item_fixture.php
@@ -65,4 +65,4 @@ class ItemFixture extends CakeTestFixture {
 		array('syfile_id' => 6, 'published' => 0, 'name' => 'Item 6')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/items_portfolio_fixture.php b/cake/tests/fixtures/items_portfolio_fixture.php
index fb7dd71bb..35673afce 100644
--- a/cake/tests/fixtures/items_portfolio_fixture.php
+++ b/cake/tests/fixtures/items_portfolio_fixture.php
@@ -64,4 +64,4 @@ class ItemsPortfolioFixture extends CakeTestFixture {
 		array('item_id' => 6, 'portfolio_id' => 2)
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/join_a_b_fixture.php b/cake/tests/fixtures/join_a_b_fixture.php
index c1a5db5df..297aa1dfb 100644
--- a/cake/tests/fixtures/join_a_b_fixture.php
+++ b/cake/tests/fixtures/join_a_b_fixture.php
@@ -65,4 +65,4 @@ class JoinABFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/join_a_c_fixture.php b/cake/tests/fixtures/join_a_c_fixture.php
index 2fc335b3e..b6a4ebcbf 100644
--- a/cake/tests/fixtures/join_a_c_fixture.php
+++ b/cake/tests/fixtures/join_a_c_fixture.php
@@ -65,4 +65,4 @@ class JoinACFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/join_a_fixture.php b/cake/tests/fixtures/join_a_fixture.php
index a4401e452..babc8bef8 100644
--- a/cake/tests/fixtures/join_a_fixture.php
+++ b/cake/tests/fixtures/join_a_fixture.php
@@ -64,4 +64,4 @@ class JoinAFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/join_b_fixture.php b/cake/tests/fixtures/join_b_fixture.php
index 16294ce97..37b45e316 100644
--- a/cake/tests/fixtures/join_b_fixture.php
+++ b/cake/tests/fixtures/join_b_fixture.php
@@ -62,4 +62,4 @@ class JoinBFixture extends CakeTestFixture {
 		array('name' => 'Join B 3', 'created' => '2008-01-03 10:55:03', 'updated' => '2008-01-03 10:55:03')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/join_c_fixture.php b/cake/tests/fixtures/join_c_fixture.php
index 333f3e28b..e37fd5c0d 100644
--- a/cake/tests/fixtures/join_c_fixture.php
+++ b/cake/tests/fixtures/join_c_fixture.php
@@ -62,4 +62,4 @@ class JoinCFixture extends CakeTestFixture {
 		array('name' => 'Join C 3', 'created' => '2008-01-03 10:56:13', 'updated' => '2008-01-03 10:56:13')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/join_thing_fixture.php b/cake/tests/fixtures/join_thing_fixture.php
index 59ebe680c..ae08e035f 100644
--- a/cake/tests/fixtures/join_thing_fixture.php
+++ b/cake/tests/fixtures/join_thing_fixture.php
@@ -65,4 +65,4 @@ class JoinThingFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/message_fixture.php b/cake/tests/fixtures/message_fixture.php
index 94b53d5ca..19814c066 100644
--- a/cake/tests/fixtures/message_fixture.php
+++ b/cake/tests/fixtures/message_fixture.php
@@ -61,4 +61,4 @@ class MessageFixture extends CakeTestFixture {
 		array('thread_id' => 3, 'name' => 'Thread 3, Message 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/my_product_fixture.php b/cake/tests/fixtures/my_product_fixture.php
index 9e2f7948a..66c365a8c 100644
--- a/cake/tests/fixtures/my_product_fixture.php
+++ b/cake/tests/fixtures/my_product_fixture.php
@@ -60,4 +60,4 @@ class MyProductFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/node_fixture.php b/cake/tests/fixtures/node_fixture.php
index a75ac25ae..9fe27b02b 100644
--- a/cake/tests/fixtures/node_fixture.php
+++ b/cake/tests/fixtures/node_fixture.php
@@ -64,4 +64,4 @@ class NodeFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/number_tree_fixture.php b/cake/tests/fixtures/number_tree_fixture.php
index 4e1b973e8..a007ed362 100644
--- a/cake/tests/fixtures/number_tree_fixture.php
+++ b/cake/tests/fixtures/number_tree_fixture.php
@@ -55,4 +55,4 @@ class NumberTreeFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/numeric_article_fixture.php b/cake/tests/fixtures/numeric_article_fixture.php
index 44fdce11c..ee1b33dc7 100644
--- a/cake/tests/fixtures/numeric_article_fixture.php
+++ b/cake/tests/fixtures/numeric_article_fixture.php
@@ -62,4 +62,4 @@ class NumericArticleFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/person_fixture.php b/cake/tests/fixtures/person_fixture.php
index 160befaeb..837ec5d11 100644
--- a/cake/tests/fixtures/person_fixture.php
+++ b/cake/tests/fixtures/person_fixture.php
@@ -70,4 +70,4 @@ class PersonFixture extends CakeTestFixture {
 		array('name' => 'father - grand father', 'mother_id' => 0, 'father_id' => 0)
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/portfolio_fixture.php b/cake/tests/fixtures/portfolio_fixture.php
index 7b4bcb584..75f7e8bf3 100644
--- a/cake/tests/fixtures/portfolio_fixture.php
+++ b/cake/tests/fixtures/portfolio_fixture.php
@@ -61,4 +61,4 @@ class PortfolioFixture extends CakeTestFixture {
 		array('seller_id' => 2, 'name' => 'Portfolio 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/post_fixture.php b/cake/tests/fixtures/post_fixture.php
index 9277517ed..4c7367687 100644
--- a/cake/tests/fixtures/post_fixture.php
+++ b/cake/tests/fixtures/post_fixture.php
@@ -65,4 +65,4 @@ class PostFixture extends CakeTestFixture {
 		array('author_id' => 1, 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/posts_tag_fixture.php b/cake/tests/fixtures/posts_tag_fixture.php
index 2c4ae6c7f..276d7d31e 100644
--- a/cake/tests/fixtures/posts_tag_fixture.php
+++ b/cake/tests/fixtures/posts_tag_fixture.php
@@ -63,4 +63,4 @@ class PostsTagFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/primary_model_fixture.php b/cake/tests/fixtures/primary_model_fixture.php
index 8c0b3e7bc..75cfcfd43 100644
--- a/cake/tests/fixtures/primary_model_fixture.php
+++ b/cake/tests/fixtures/primary_model_fixture.php
@@ -59,4 +59,4 @@ class PrimaryModelFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/project_fixture.php b/cake/tests/fixtures/project_fixture.php
index 6f48b05b8..ed12d54e3 100644
--- a/cake/tests/fixtures/project_fixture.php
+++ b/cake/tests/fixtures/project_fixture.php
@@ -60,4 +60,4 @@ class ProjectFixture extends CakeTestFixture {
 		array('name' => 'Project 3')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/secondary_model_fixture.php b/cake/tests/fixtures/secondary_model_fixture.php
index 8c7ccfc3a..57b33d2e6 100644
--- a/cake/tests/fixtures/secondary_model_fixture.php
+++ b/cake/tests/fixtures/secondary_model_fixture.php
@@ -59,4 +59,4 @@ class SecondaryModelFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/session_fixture.php b/cake/tests/fixtures/session_fixture.php
index 1dc3c751a..ccfea5860 100644
--- a/cake/tests/fixtures/session_fixture.php
+++ b/cake/tests/fixtures/session_fixture.php
@@ -57,4 +57,4 @@ class SessionFixture extends CakeTestFixture {
  */
 	var $records = array();
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/something_else_fixture.php b/cake/tests/fixtures/something_else_fixture.php
index 7b6dbd2cd..aa6667adc 100644
--- a/cake/tests/fixtures/something_else_fixture.php
+++ b/cake/tests/fixtures/something_else_fixture.php
@@ -65,4 +65,4 @@ class SomethingElseFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/something_fixture.php b/cake/tests/fixtures/something_fixture.php
index cecfb3f9d..3bb36bfab 100644
--- a/cake/tests/fixtures/something_fixture.php
+++ b/cake/tests/fixtures/something_fixture.php
@@ -65,4 +65,4 @@ class SomethingFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/stories_tag_fixture.php b/cake/tests/fixtures/stories_tag_fixture.php
index b39566abb..2bbfc97e1 100644
--- a/cake/tests/fixtures/stories_tag_fixture.php
+++ b/cake/tests/fixtures/stories_tag_fixture.php
@@ -59,4 +59,4 @@ class StoriesTagFixture extends CakeTestFixture {
 		array('story' => 1, 'tag_id' => 1)
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/story_fixture.php b/cake/tests/fixtures/story_fixture.php
index c8e90de6d..6a50a2745 100644
--- a/cake/tests/fixtures/story_fixture.php
+++ b/cake/tests/fixtures/story_fixture.php
@@ -59,4 +59,4 @@ class StoryFixture extends CakeTestFixture {
 		array('title' => 'Second Story')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/syfile_fixture.php b/cake/tests/fixtures/syfile_fixture.php
index 8e5a075ad..7521aaff6 100644
--- a/cake/tests/fixtures/syfile_fixture.php
+++ b/cake/tests/fixtures/syfile_fixture.php
@@ -66,4 +66,4 @@ class SyfileFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/tag_fixture.php b/cake/tests/fixtures/tag_fixture.php
index afc205e57..a381b798b 100644
--- a/cake/tests/fixtures/tag_fixture.php
+++ b/cake/tests/fixtures/tag_fixture.php
@@ -63,4 +63,4 @@ class TagFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/test_plugin_article_fixture.php b/cake/tests/fixtures/test_plugin_article_fixture.php
index 148fea15d..eee616596 100644
--- a/cake/tests/fixtures/test_plugin_article_fixture.php
+++ b/cake/tests/fixtures/test_plugin_article_fixture.php
@@ -66,4 +66,4 @@ class TestPluginArticleFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/test_plugin_comment_fixture.php b/cake/tests/fixtures/test_plugin_comment_fixture.php
index 847d2ce4b..fa77c6119 100644
--- a/cake/tests/fixtures/test_plugin_comment_fixture.php
+++ b/cake/tests/fixtures/test_plugin_comment_fixture.php
@@ -69,4 +69,4 @@ class TestPluginCommentFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/the_paper_monkies_fixture.php b/cake/tests/fixtures/the_paper_monkies_fixture.php
index f8efce2db..7966b39ea 100644
--- a/cake/tests/fixtures/the_paper_monkies_fixture.php
+++ b/cake/tests/fixtures/the_paper_monkies_fixture.php
@@ -57,4 +57,4 @@ class ThePaperMonkiesFixture extends CakeTestFixture {
 	var $records = array();
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/thread_fixture.php b/cake/tests/fixtures/thread_fixture.php
index 118aa0ff2..1781e8e05 100644
--- a/cake/tests/fixtures/thread_fixture.php
+++ b/cake/tests/fixtures/thread_fixture.php
@@ -61,4 +61,4 @@ class ThreadFixture extends CakeTestFixture {
 		array('project_id' => 2, 'name' => 'Project 2, Thread 1')
 	);
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/translate_article_fixture.php b/cake/tests/fixtures/translate_article_fixture.php
index 549872c34..fb56a815c 100644
--- a/cake/tests/fixtures/translate_article_fixture.php
+++ b/cake/tests/fixtures/translate_article_fixture.php
@@ -87,4 +87,4 @@ class TranslateArticleFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/translate_table_fixture.php b/cake/tests/fixtures/translate_table_fixture.php
index 1a645e375..633b556d5 100644
--- a/cake/tests/fixtures/translate_table_fixture.php
+++ b/cake/tests/fixtures/translate_table_fixture.php
@@ -70,4 +70,4 @@ class TranslateTableFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/translated_article_fixture.php b/cake/tests/fixtures/translated_article_fixture.php
index bce536975..1fc7f6d98 100644
--- a/cake/tests/fixtures/translated_article_fixture.php
+++ b/cake/tests/fixtures/translated_article_fixture.php
@@ -64,4 +64,4 @@ class TranslatedArticleFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/translated_item_fixture.php b/cake/tests/fixtures/translated_item_fixture.php
index f8b93ce8a..43ac7fff8 100644
--- a/cake/tests/fixtures/translated_item_fixture.php
+++ b/cake/tests/fixtures/translated_item_fixture.php
@@ -61,4 +61,4 @@ class TranslatedItemFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/underscore_field_fixture.php b/cake/tests/fixtures/underscore_field_fixture.php
index c87ace540..5e7fde739 100644
--- a/cake/tests/fixtures/underscore_field_fixture.php
+++ b/cake/tests/fixtures/underscore_field_fixture.php
@@ -66,4 +66,4 @@ class UnderscoreFieldFixture extends CakeTestFixture {
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/user_fixture.php b/cake/tests/fixtures/user_fixture.php
index bb8478034..739c455f4 100644
--- a/cake/tests/fixtures/user_fixture.php
+++ b/cake/tests/fixtures/user_fixture.php
@@ -65,4 +65,4 @@ class UserFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/fixtures/uuid_fixture.php b/cake/tests/fixtures/uuid_fixture.php
index 12a0dd99f..295cb5748 100644
--- a/cake/tests/fixtures/uuid_fixture.php
+++ b/cake/tests/fixtures/uuid_fixture.php
@@ -65,4 +65,4 @@ class UuidFixture extends CakeTestFixture {
 	);
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/cake/tests/groups/controller.group.php b/cake/tests/groups/controller.group.php
index 8bbc801ac..074c20510 100644
--- a/cake/tests/groups/controller.group.php
+++ b/cake/tests/groups/controller.group.php
@@ -52,4 +52,4 @@ function ControllerGroupTest() {
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'controller_merge_vars');
 	}
 }
-?>
+?>
\ No newline at end of file

From cb4a1f07e5e0c2e7feb90e18b6faa2130f84d3ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Lorenzo=20Rodr=C3=ADguez?= <jose.zap@gmail.com>
Date: Mon, 18 Jan 2010 13:05:30 -0430
Subject: [PATCH 159/244] Fixing issue with persistModels and plugin models,
 closes #192 and #198

---
 cake/libs/model/model.php                     |  3 ++
 cake/libs/object.php                          |  2 +-
 cake/tests/cases/libs/object.test.php         | 15 +++++++--
 cake/tests/test_app/models/persister_one.php  |  4 +--
 cake/tests/test_app/models/persister_two.php  |  4 +--
 .../models/test_plugin_authors.php            | 31 +++++++++++++++++++
 .../models/test_plugin_comment.php            | 31 +++++++++++++++++++
 7 files changed, 83 insertions(+), 7 deletions(-)
 create mode 100644 cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
 create mode 100644 cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 01b05c186..78be07d47 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -667,6 +667,9 @@ function __constructLinkedModel($assoc, $className = null) {
 			} else {
 				$this->{$assoc} =& ClassRegistry::init($model);
 			}
+			if (strpos($className, '.') !== false) {
+				ClassRegistry::addObject($className, $this->{$assoc});
+			}
 			if ($assoc) {
 				$this->tableToModel[$this->{$assoc}->table] = $assoc;
 			}
diff --git a/cake/libs/object.php b/cake/libs/object.php
index 7a8ddfd33..eda5d7f63 100644
--- a/cake/libs/object.php
+++ b/cake/libs/object.php
@@ -275,7 +275,7 @@ function __openPersistent($name, $type = null) {
 					if (strpos($key, '_behavior') !== false) {
 						App::import('Behavior', Inflector::classify(substr($key, 0, -9)));
 					} else {
-						App::import('Model', Inflector::classify($key));
+						App::import('Model', Inflector::camelize($key));
 					}
 					unset ($value);
 				}
diff --git a/cake/tests/cases/libs/object.test.php b/cake/tests/cases/libs/object.test.php
index de63a517d..c5894c7cb 100644
--- a/cake/tests/cases/libs/object.test.php
+++ b/cake/tests/cases/libs/object.test.php
@@ -431,6 +431,7 @@ function testPersistWithBehavior() {
 		$this->assertFalse(class_exists('PersisterOneBehaviorBehavior'));
 		$this->assertFalse(class_exists('PersisterTwoBehaviorBehavior'));
 		$this->assertFalse(class_exists('TestPluginPersisterBehavior'));
+		$this->assertFalse(class_exists('TestPluginAuthors'));
 
 		$Controller = new RequestActionPersistentController();
 		$Controller->persistModel = true;
@@ -439,13 +440,18 @@ function testPersistWithBehavior() {
 		$this->assertTrue(file_exists(CACHE . 'persistent' . DS . 'persisterone.php'));
 		$this->assertTrue(file_exists(CACHE . 'persistent' . DS . 'persisteroneregistry.php'));
 
-		$contents = str_replace('"PersisterOne"', '"PersisterTwo"', file_get_contents(CACHE . 'persistent' . DS . 'persisteroneregistry.php'));
-		$contents = str_replace('persister_one_', 'persister_two_', file_get_contents(CACHE . 'persistent' . DS . 'persisteroneregistry.php'));
+		$contents = file_get_contents(CACHE . 'persistent' . DS . 'persisteroneregistry.php');
+		$contents = str_replace('"PersisterOne"', '"PersisterTwo"', $contents);
+		$contents = str_replace('persister_one', 'persister_two', $contents);
+		$contents = str_replace('test_plugin_comment', 'test_plugin_authors', $contents);
 		$result = file_put_contents(CACHE . 'persistent' . DS . 'persisteroneregistry.php', $contents);
 
 		$this->assertTrue(class_exists('PersisterOneBehaviorBehavior'));
+		$this->assertTrue(class_exists('TestPluginPersisterOneBehavior'));
+		$this->assertTrue(class_exists('TestPluginComment'));
 		$this->assertFalse(class_exists('PersisterTwoBehaviorBehavior'));
 		$this->assertFalse(class_exists('TestPluginPersisterTwoBehavior'));
+		$this->assertFalse(class_exists('TestPluginAuthors'));
 
 		$Controller = new RequestActionPersistentController();
 		$Controller->persistModel = true;
@@ -454,6 +460,7 @@ function testPersistWithBehavior() {
 		$this->assertTrue(class_exists('PersisterOneBehaviorBehavior'));
 		$this->assertTrue(class_exists('PersisterTwoBehaviorBehavior'));
 		$this->assertTrue(class_exists('TestPluginPersisterTwoBehavior'));
+		$this->assertTrue(class_exists('TestPluginAuthors'));
 
 		@unlink(CACHE . 'persistent' . DS . 'persisterone.php');
 		@unlink(CACHE . 'persistent' . DS . 'persisteroneregistry.php');
@@ -490,6 +497,8 @@ function testPersistWithBehaviorAndRequestAction() {
 		$this->assertEqual($keys, array(
 			'persister_one',
 			'comment',
+			'test_plugin_comment',
+			'test_plugin.test_plugin_comment',
 			'persister_one_behavior_behavior',
 			'test_plugin_persister_one_behavior',
 			'test_plugin.test_plugin_persister_one_behavior'
@@ -504,6 +513,8 @@ function testPersistWithBehaviorAndRequestAction() {
 		$this->assertEqual($keys, array(
 			'persister_one',
 			'comment',
+			'test_plugin_comment',
+			'test_plugin.test_plugin_comment',
 			'persister_one_behavior_behavior',
 			'test_plugin_persister_one_behavior',
 			'test_plugin.test_plugin_persister_one_behavior',
diff --git a/cake/tests/test_app/models/persister_one.php b/cake/tests/test_app/models/persister_one.php
index 6f0fbf48d..8df8a4eac 100644
--- a/cake/tests/test_app/models/persister_one.php
+++ b/cake/tests/test_app/models/persister_one.php
@@ -28,8 +28,8 @@ class PersisterOne extends AppModel {
 	var $useTable = 'posts';
 	var $name = 'PersisterOne';
 
-	var $actsAs = array('PersisterOneBehavior','TestPlugin.TestPluginPersisterOne');
+	var $actsAs = array('PersisterOneBehavior', 'TestPlugin.TestPluginPersisterOne');
 
-	var $hasMany = array('Comment');
+	var $hasMany = array('Comment', 'TestPlugin.TestPluginComment');
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/test_app/models/persister_two.php b/cake/tests/test_app/models/persister_two.php
index 0fb3ceb65..417cc146b 100644
--- a/cake/tests/test_app/models/persister_two.php
+++ b/cake/tests/test_app/models/persister_two.php
@@ -28,8 +28,8 @@ class PersisterTwo extends AppModel {
 	var $useTable = 'posts';
 	var $name = 'PersisterTwo';
 
-	var $actsAs = array('PersisterOneBehavior','TestPlugin.TestPluginPersisterOne');
+	var $actsAs = array('PersisterOneBehavior', 'TestPlugin.TestPluginPersisterOne');
 
-	var $hasMany = array('Comment');
+	var $hasMany = array('Comment', 'TestPlugin.TestPluginComment');
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
new file mode 100644
index 000000000..56b963539
--- /dev/null
+++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
@@ -0,0 +1,31 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Test App Comment Model
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.
+ * @since         CakePHP v 1.2.0.7726
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+class TestPluginAuthors extends TestPluginAppModel {
+	var $useTable = 'authors';
+	var $name = 'TestPluginAuthors';
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
new file mode 100644
index 000000000..90e6e9293
--- /dev/null
+++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
@@ -0,0 +1,31 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Test App Comment Model
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.
+ * @since         CakePHP v 1.2.0.7726
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+class TestPluginComment extends TestPluginAppModel {
+	var $useTable = 'comments';
+	var $name = 'TestPluginComment';
+}
+?>
\ No newline at end of file

From 96fd0bf10020945b93e4e6e4d60051c5af6c3135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Lorenzo=20Rodr=C3=ADguez?= <jose.zap@gmail.com>
Date: Tue, 19 Jan 2010 16:44:43 -0430
Subject: [PATCH 160/244] Fixing error introduced in previous commit due to bad
 merge

---
 cake/libs/model/behavior.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/model/behavior.php b/cake/libs/model/behavior.php
index 368f2a18e..61d319485 100644
--- a/cake/libs/model/behavior.php
+++ b/cake/libs/model/behavior.php
@@ -287,7 +287,7 @@ function attach($behavior, $config = array()) {
 				}
 				ClassRegistry::addObject($class, $this->{$name});
 				if (!empty($plugin)) {
-					ClassRegistry::addObject($plugin.'.'.$class, $clas);
+					ClassRegistry::addObject($plugin.'.'.$class, $this->{$name});
 				}
 			}
 		} elseif (isset($this->{$name}->settings) && isset($this->{$name}->settings[$this->modelName])) {

From ae4a31f0700deed0af993c8d2b05a305195f1eab Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Wed, 20 Jan 2010 14:33:37 -0500
Subject: [PATCH 161/244] Making DEFAULT_LANGUAGE also set $language var which
 sets Config.language to a correct value.  Fixes #228

---
 cake/libs/l10n.php                  | 2 +-
 cake/tests/cases/libs/l10n.test.php | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php
index a0acb162d..85f978a7d 100644
--- a/cake/libs/l10n.php
+++ b/cake/libs/l10n.php
@@ -352,7 +352,7 @@ function __setLanguage($language = null) {
 		} else if ($language !== null && isset($this->__l10nCatalog[$language])) {
 			$langKey = $language;
 		} else if (defined('DEFAULT_LANGUAGE')) {
-			$langKey = DEFAULT_LANGUAGE;
+			$langKey = $language = DEFAULT_LANGUAGE;
 		}
 
 		if ($langKey !== null && isset($this->__l10nCatalog[$langKey])) {
diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php
index 5687571fe..1e99235ef 100644
--- a/cake/tests/cases/libs/l10n.test.php
+++ b/cake/tests/cases/libs/l10n.test.php
@@ -99,6 +99,11 @@ function testGet() {
 		$expected = 'en_us';
 		$this->assertEqual($result, $expected);
 
+		$l10n->get('es');
+		$l10n->get('');
+		$this->assertEqual($l10n->lang, 'en-us');
+
+
 		// Using $this->default
 		$l10n = new L10n();
 		$l10n->get('use_default');

From 317463096a4f22b624595568925c1c27aaecc95f Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Wed, 20 Jan 2010 14:53:57 -0500
Subject: [PATCH 162/244] Refactoring tests in l10n that use object properties.

---
 cake/tests/cases/libs/l10n.test.php | 106 +++++++---------------------
 1 file changed, 25 insertions(+), 81 deletions(-)

diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php
index 1e99235ef..a11d1e031 100644
--- a/cake/tests/cases/libs/l10n.test.php
+++ b/cake/tests/cases/libs/l10n.test.php
@@ -43,61 +43,33 @@ function testGet() {
 
 		// Catalog Entry
 		$l10n->get('en');
-		$result = $l10n->language;
-		$expected = 'English';
-		$this->assertEqual($result, $expected);
 
-		$result = $l10n->languagePath;
-		$expected = array('eng', 'eng');
-		$this->assertEqual($result, $expected);
-
-		$result = $l10n->locale;
-		$expected = 'eng';
-		$this->assertEqual($result, $expected);
+		$this->assertEqual($l10n->language, 'English');
+		$this->assertEqual($l10n->languagePath, array('eng', 'eng'));
+		$this->assertEqual($l10n->locale, 'eng');
 
 		// Map Entry
 		$l10n->get('eng');
-		$result = $l10n->language;
-		$expected = 'English';
-		$this->assertEqual($result, $expected);
 
-		$result = $l10n->languagePath;
-		$expected = array('eng', 'eng');
-		$this->assertEqual($result, $expected);
-
-		$result = $l10n->locale;
-		$expected = 'eng';
-		$this->assertEqual($result, $expected);
+		$this->assertEqual($l10n->language, 'English');
+		$this->assertEqual($l10n->languagePath, array('eng', 'eng'));
+		$this->assertEqual($l10n->locale, 'eng');
 
 		// Catalog Entry
 		$l10n->get('en-ca');
-		$result = $l10n->language;
-		$expected = 'English (Canadian)';
-		$this->assertEqual($result, $expected);
 
-		$result = $l10n->languagePath;
-		$expected = array('en_ca', 'eng');
-		$this->assertEqual($result, $expected);
-
-		$result = $l10n->locale;
-		$expected = 'en_ca';
-		$this->assertEqual($result, $expected);
+		$this->assertEqual($l10n->language, 'English (Canadian)');
+		$this->assertEqual($l10n->languagePath, array('en_ca', 'eng'));
+		$this->assertEqual($l10n->locale, 'en_ca');
 
 		// Default Entry
 		define('DEFAULT_LANGUAGE', 'en-us');
 
 		$l10n->get('use_default');
-		$result = $l10n->language;
-		$expected = 'English (United States)';
-		$this->assertEqual($result, $expected);
 
-		$result = $l10n->languagePath;
-		$expected = array('en_us', 'eng');
-		$this->assertEqual($result, $expected);
-
-		$result = $l10n->locale;
-		$expected = 'en_us';
-		$this->assertEqual($result, $expected);
+		$this->assertEqual($l10n->language, 'English (United States)');
+		$this->assertEqual($l10n->languagePath, array('en_us', 'eng'));
+		$this->assertEqual($l10n->locale, 'en_us');
 
 		$l10n->get('es');
 		$l10n->get('');
@@ -106,18 +78,11 @@ function testGet() {
 
 		// Using $this->default
 		$l10n = new L10n();
-		$l10n->get('use_default');
-		$result = $l10n->language;
-		$expected = 'English (United States)';
-		$this->assertEqual($result, $expected);
-
-		$result = $l10n->languagePath;
-		$expected = array('en_us', 'eng', 'eng');
-		$this->assertEqual($result, $expected);
 
-		$result = $l10n->locale;
-		$expected = 'en_us';
-		$this->assertEqual($result, $expected);
+		$l10n->get('use_default');
+		$this->assertEqual($l10n->language, 'English (United States)');
+		$this->assertEqual($l10n->languagePath, array('en_us', 'eng', 'eng'));
+		$this->assertEqual($l10n->locale, 'en_us');
 	}
 /**
  * testGetAutoLanguage method
@@ -131,45 +96,24 @@ function testGetAutoLanguage() {
 
 		$l10n =& new L10n();
 		$l10n->get();
-		$result = $l10n->language;
-		$expected = 'English (Canadian)';
-		$this->assertEqual($result, $expected);
-
-		$result = $l10n->languagePath;
-		$expected = array('en_ca', 'eng', 'eng');
-		$this->assertEqual($result, $expected);
 
-		$result = $l10n->locale;
-		$expected = 'en_ca';
-		$this->assertEqual($result, $expected);
+		$this->assertEqual($l10n->language, 'English (Canadian)');
+		$this->assertEqual($l10n->languagePath, array('en_ca', 'eng', 'eng'));
+		$this->assertEqual($l10n->locale, 'en_ca');
 
 		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'es_mx';
 		$l10n->get();
-		$result = $l10n->language;
-		$expected = 'Spanish (Mexican)';
-		$this->assertEqual($result, $expected);
-
-		$result = $l10n->languagePath;
-		$expected = array('es_mx', 'spa', 'eng');
-		$this->assertEqual($result, $expected);
 
-		$result = $l10n->locale;
-		$expected = 'es_mx';
-		$this->assertEqual($result, $expected);
+		$this->assertEqual($l10n->language, 'Spanish (Mexican)');
+		$this->assertEqual($l10n->languagePath, array('es_mx', 'spa', 'eng'));
+		$this->assertEqual($l10n->locale, 'es_mx');
 
 		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en_xy,en_ca';
 		$l10n->get();
-		$result = $l10n->language;
-		$expected = 'English';
-		$this->assertEqual($result, $expected);
-
-		$result = $l10n->languagePath;
-		$expected = array('eng', 'eng', 'eng');
-		$this->assertEqual($result, $expected);
 
-		$result = $l10n->locale;
-		$expected = 'eng';
-		$this->assertEqual($result, $expected);
+		$this->assertEqual($l10n->language, 'English');
+		$this->assertEqual($l10n->languagePath, array('eng', 'eng', 'eng'));
+		$this->assertEqual($l10n->locale, 'eng');
 
 		$_SERVER = $__SERVER;
 	}

From 5d35fd8d38b0b3a89b1f72d9e069b82e11e0acb4 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Fri, 22 Jan 2010 10:30:22 -0500
Subject: [PATCH 163/244] Fixing issues in DboSource::defaultConditions() and
 DboSource::conditions() where doubly deleting a record from the beforeDelete
 and delete() could create incorrect conditions that would delete all records
 in a table. Fixes #250

---
 cake/libs/model/datasources/dbo_source.php    | 27 ++++++++++++++-----
 .../model/datasources/dbo_source.test.php     | 25 +++++++++++++++++
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 5de4db2ee..95929a56c 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -1378,6 +1378,7 @@ function update(&$model, $fields = array(), $values = null, $conditions = null)
 		} else {
 			$combined = array_combine($fields, $values);
 		}
+
 		$fields = implode(', ', $this->_prepareUpdateFields($model, $combined, empty($conditions)));
 
 		$alias = $joins = null;
@@ -1605,18 +1606,27 @@ function rollback(&$model) {
 	}
 /**
  * Creates a default set of conditions from the model if $conditions is null/empty.
+ * If conditions are supplied then they will be returned.  If a model doesn't exist and no conditions
+ * were provided either null or false will be returned based on what was input.
  *
  * @param object $model
- * @param mixed	 $conditions
+ * @param mixed $conditions Array of conditions, conditions string, null or false. If an array of conditions,
+ *   or string conditions those conditions will be returned.  With other values the model's existance will be checked.
+ *   If the model doesn't exist a null or false will be returned depending on the input value.
  * @param boolean $useAlias Use model aliases rather than table names when generating conditions
- * @return mixed
+ * @return mixed Either null, false, $conditions or an array of default conditions to use.
+ * @see DboSource::update()
+ * @see DboSource::conditions()
  */
 	function defaultConditions(&$model, $conditions, $useAlias = true) {
 		if (!empty($conditions)) {
 			return $conditions;
 		}
-		if (!$model->exists()) {
+		$exists = $model->exists();
+		if (!$exists && $conditions !== null) {
 			return false;
+		} elseif (!$exists) {
+			return null;
 		}
 		$alias = $model->alias;
 
@@ -1741,9 +1751,11 @@ function fields(&$model, $alias = null, $fields = array(), $quote = true) {
 		return array_unique($fields);
 	}
 /**
- * Creates a WHERE clause by parsing given conditions data.
+ * Creates a WHERE clause by parsing given conditions data.  If an array or string
+ * conditions are provided those conditions will be parsed and quoted.  If a boolean
+ * is given it will be integer cast as condition.  Null will return 1 = 1.
  *
- * @param mixed $conditions Array or string of conditions
+ * @param mixed $conditions Array or string of conditions, or any value.
  * @param boolean $quoteValues If true, values should be quoted
  * @param boolean $where If true, "WHERE " will be prepended to the return value
  * @param Model $model A reference to the Model instance making the query
@@ -1764,8 +1776,11 @@ function conditions($conditions, $quoteValues = true, $where = true, $model = nu
 			}
 			return $clause . implode(' AND ', $out);
 		}
+		if ($conditions === false || $conditions === true) {
+			return $clause . (int)$conditions . ' = 1';
+		}
 
-		if (empty($conditions) || trim($conditions) == '' || $conditions === true) {
+		if (empty($conditions) || trim($conditions) == '') {
 			return $clause . '1 = 1';
 		}
 		$clauses = '/^WHERE\\x20|^GROUP\\x20BY\\x20|^HAVING\\x20|^ORDER\\x20BY\\x20/i';
diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
index 321574ee6..7fe1a5a21 100644
--- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -2096,6 +2096,30 @@ function testSelectDistict() {
 		$expected = array('DISTINCT `Vendor`.`id`', '`Vendor`.`name`');
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * test that booleans and null make logical condition strings.
+ *
+ * @return void
+ */
+	function testBooleanNullConditionsParsing() {
+		$result = $this->testDb->conditions(true);
+		$this->assertEqual($result, ' WHERE 1 = 1', 'true conditions failed %s');
+
+		$result = $this->testDb->conditions(false);
+		$this->assertEqual($result, ' WHERE 0 = 1', 'false conditions failed %s');
+
+		$result = $this->testDb->conditions(null);
+		$this->assertEqual($result, ' WHERE 1 = 1', 'null conditions failed %s');
+
+		$result = $this->testDb->conditions(array());
+		$this->assertEqual($result, ' WHERE 1 = 1', 'array() conditions failed %s');
+
+		$result = $this->testDb->conditions('');
+		$this->assertEqual($result, ' WHERE 1 = 1', '"" conditions failed %s');
+
+		$result = $this->testDb->conditions(' ', '"  " conditions failed %s');
+		$this->assertEqual($result, ' WHERE 1 = 1');
+	}
 /**
  * testStringConditionsParsing method
  *
@@ -3093,6 +3117,7 @@ function testRenderStatement() {
 		$result = $this->testDb->renderStatement('delete', array('fields' => 'value=2', 'table' => 'table', 'conditions' => 'WHERE 1=1', 'alias' => 'alias', 'joins' => ''));
 		$this->assertPattern('/^\s*DELETE\s+alias\s+FROM\s+table\s+AS\s+alias\s+WHERE\s+1=1\s*$/', $result);
 	}
+
 /**
  * testStatements method
  *

From 03200440ed91d5a0c1cac1b0ff4ada8335163ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Lorenzo=20Rodr=C3=ADguez?= <jose.zap@gmail.com>
Date: Sun, 24 Jan 2010 18:27:08 -0430
Subject: [PATCH 164/244] Fixing TranslateBehavior and $tablePrefix. Closes
 #168

---
 cake/libs/model/behaviors/translate.php       |  6 +-
 .../libs/model/behaviors/translate.test.php   | 24 ++++-
 cake/tests/cases/libs/model/models.php        | 65 ++++++++++++++
 .../translate_with_prefix_fixture.php         | 89 +++++++++++++++++++
 4 files changed, 182 insertions(+), 2 deletions(-)
 create mode 100644 cake/tests/fixtures/translate_with_prefix_fixture.php

diff --git a/cake/libs/model/behaviors/translate.php b/cake/libs/model/behaviors/translate.php
index 64011295b..24659ef38 100644
--- a/cake/libs/model/behaviors/translate.php
+++ b/cake/libs/model/behaviors/translate.php
@@ -93,8 +93,12 @@ function beforeFind(&$model, $query) {
 			return $query;
 		}
 		$db =& ConnectionManager::getDataSource($model->useDbConfig);
-		$tablePrefix = $db->config['prefix'];
 		$RuntimeModel =& $this->translateModel($model);
+		if (!empty($RuntimeModel->tablePrefix)) {
+			$tablePrefix = $RuntimeModel->tablePrefix;
+		} else {
+			$tablePrefix = $db->config['prefix'];
+		}
 
 		if (is_string($query['fields']) && 'COUNT(*) AS '.$db->name('count') == $query['fields']) {
 			$query['fields'] = 'COUNT(DISTINCT('.$db->name($model->alias . '.' . $model->primaryKey) . ')) ' . $db->alias . 'count';
diff --git a/cake/tests/cases/libs/model/behaviors/translate.test.php b/cake/tests/cases/libs/model/behaviors/translate.test.php
index 3914dec46..55e13d8af 100644
--- a/cake/tests/cases/libs/model/behaviors/translate.test.php
+++ b/cake/tests/cases/libs/model/behaviors/translate.test.php
@@ -52,7 +52,8 @@ class TranslateBehaviorTest extends CakeTestCase {
  */
 	var $fixtures = array(
 		'core.translated_item', 'core.translate', 'core.translate_table',
-		'core.translated_article', 'core.translate_article', 'core.user', 'core.comment', 'core.tag', 'core.articles_tag'
+		'core.translated_article', 'core.translate_article', 'core.user', 'core.comment', 'core.tag', 'core.articles_tag',
+		'core.translate_with_prefix'
 	);
 /**
  * endTest method
@@ -835,5 +836,26 @@ function testTranslateWithAssociations() {
 		);
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * testTranslateTableWithPrefix method
+ * Tests that is possible to have a translation model with a custom tablePrefix
+ *
+ * @access public
+ * @return void
+ */
+	function testTranslateTableWithPrefix() {
+		$this->loadFixtures('TranslateWithPrefix', 'TranslatedItem');
+		$TestModel =& new TranslatedItem2;
+		$TestModel->locale = 'eng';
+		$result = $TestModel->read(null, 1);
+		$expected = array('TranslatedItem' => array(
+			'id' => 1,
+			'slug' => 'first_translated',
+			'locale' => 'eng',
+			'content' => 'Content #1',
+			'title' => 'Title #1'
+		));
+		$this->assertEqual($result, $expected);
+	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index 27829184f..b86779ddb 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -2790,6 +2790,35 @@ class TranslateTestModel extends CakeTestModel {
  */
 	var $displayField = 'field';
 }
+/**
+ * TranslateTestModel class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TranslateWithPrefix extends CakeTestModel {
+/**
+ * name property
+ *
+ * @var string 'TranslateTestModel'
+ * @access public
+ */
+	var $name = 'TranslateWithPrefix';
+/**
+ * tablePrefix property
+ *
+ * @var string 'i18n'
+ * @access public
+ */
+	var $tablePrefix = 'i18n_';
+/**
+ * displayField property
+ *
+ * @var string 'field'
+ * @access public
+ */
+	var $displayField = 'field';
+}
 /**
  * TranslatedItem class.
  *
@@ -2826,6 +2855,42 @@ class TranslatedItem extends CakeTestModel {
  */
 	var $translateModel = 'TranslateTestModel';
 }
+/**
+ * TranslatedItem class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TranslatedItem2 extends CakeTestModel {
+/**
+ * name property
+ *
+ * @var string 'TranslatedItem'
+ * @access public
+ */
+	var $name = 'TranslatedItem';
+/**
+ * cacheQueries property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $cacheQueries = false;
+/**
+ * actsAs property
+ *
+ * @var array
+ * @access public
+ */
+	var $actsAs = array('Translate' => array('content', 'title'));
+/**
+ * translateModel property
+ *
+ * @var string 'TranslateTestModel'
+ * @access public
+ */
+	var $translateModel = 'TranslateWithPrefix';
+}
 /**
  * TranslatedItemWithTable class.
  *
diff --git a/cake/tests/fixtures/translate_with_prefix_fixture.php b/cake/tests/fixtures/translate_with_prefix_fixture.php
new file mode 100644
index 000000000..f8e3fc44a
--- /dev/null
+++ b/cake/tests/fixtures/translate_with_prefix_fixture.php
@@ -0,0 +1,89 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Short description for file.
+ *
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class TranslateWithPrefixFixture extends CakeTestFixture {
+/**
+ * name property
+ *
+ * @var string 'Translate'
+ * @access public
+ */
+	var $name = 'TranslateWithPrefix';
+/**
+ * table property
+ *
+ * @var string 'i18n'
+ * @access public
+ */
+	var $table = 'i18n_translate_with_prefixes';
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'locale' => array('type' => 'string', 'length' => 6, 'null' => false),
+		'model' => array('type' => 'string', 'null' => false),
+		'foreign_key' => array('type' => 'integer', 'null' => false),
+		'field' => array('type' => 'string', 'null' => false),
+		'content' => array('type' => 'text')
+	);
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Title #1'),
+		array('id' => 2, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Content #1'),
+		array('id' => 3, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titel #1'),
+		array('id' => 4, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Inhalt #1'),
+		array('id' => 5, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titulek #1'),
+		array('id' => 6, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Obsah #1'),
+		array('id' => 7, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Title #2'),
+		array('id' => 8, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Content #2'),
+		array('id' => 9, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Titel #2'),
+		array('id' => 10, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Inhalt #2'),
+		array('id' => 11, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Titulek #2'),
+		array('id' => 12, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Obsah #2'),
+		array('id' => 13, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Title #3'),
+		array('id' => 14, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Content #3'),
+		array('id' => 15, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Titel #3'),
+		array('id' => 16, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Inhalt #3'),
+		array('id' => 17, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Titulek #3'),
+		array('id' => 18, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Obsah #3')
+	);
+}
+?>
\ No newline at end of file

From b1a0eb10973e037a33b1299c3210b3642004ae5d Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Tue, 26 Jan 2010 10:10:22 -0500
Subject: [PATCH 165/244] Fixing double DS when requiring cache engines.  Fixes
 #254

---
 cake/libs/cache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index ee39f42ca..1162e61e6 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -81,7 +81,7 @@ function &getInstance() {
  */
 	function __loadEngine($name) {
 		if (!class_exists($name . 'Engine')) {
-			require LIBS . DS . 'cache' . DS . strtolower($name) . '.php';
+			require LIBS . 'cache' . DS . strtolower($name) . '.php';
 		}
 		return true;
 	}

From 16eaa990df971baca4664641dc8c6c92f9785d66 Mon Sep 17 00:00:00 2001
From: Robust Solution <hussein_elharake@yahoo.com>
Date: Wed, 20 Jan 2010 22:18:55 +0000
Subject: [PATCH 166/244] optimization in AuthComponent class startup method

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/controller/components/auth.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
index abebeb0f5..574481a7a 100644
--- a/cake/libs/controller/components/auth.php
+++ b/cake/libs/controller/components/auth.php
@@ -262,10 +262,6 @@ function initialize(&$controller) {
  * @access public
  */
 	function startup(&$controller) {
-		$methods = array_flip($controller->methods);
-		$action = strtolower($controller->params['action']);
-		$allowedActions = array_map('strtolower', $this->allowedActions);
-
 		$isErrorOrTests = (
 			strtolower($controller->name) == 'cakeerror' ||
 			(strtolower($controller->name) == 'tests' && Configure::read() > 0)
@@ -274,6 +270,8 @@ function startup(&$controller) {
 			return true;
 		}
 
+		$methods = array_flip($controller->methods);
+		$action = strtolower($controller->params['action']);
 		$isMissingAction = (
 			$controller->scaffold === false &&
 			!isset($methods[$action])
@@ -296,6 +294,7 @@ function startup(&$controller) {
 		$url = Router::normalize($url);
 		$loginAction = Router::normalize($this->loginAction);
 
+		$allowedActions = array_map('strtolower', $this->allowedActions);
 		$isAllowed = (
 			$this->allowedActions == array('*') ||
 			in_array($action, $allowedActions)

From 9cbb9d193aca9cf96cfd927e750401ad9b4f8334 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Tue, 26 Jan 2010 10:55:11 -0500
Subject: [PATCH 167/244] Fixing php4 compatibility and errors from array to
 string conversion.

---
 cake/libs/view/helpers/form.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 62982ee75..a1aaa34fc 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -1721,7 +1721,10 @@ function __selectOptions($elements = array(), $selected = null, $parents = array
 			}
 
 			if ($name !== null) {
-				if ((!$selectedIsEmpty && (string)$selected == (string)$name) || ($selectedIsArray && in_array($name, $selected))) {
+				if (
+					(!$selectedIsArray && !$selectedIsEmpty && (string)$selected == (string)$name) || 
+					($selectedIsArray && in_array($name, $selected))
+				) {
 					if ($attributes['style'] === 'checkbox') {
 						$htmlOptions['checked'] = true;
 					} else {

From c195d654b329c48c586c9739e4f36c4bf995b58d Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Tue, 26 Jan 2010 11:00:37 -0500
Subject: [PATCH 168/244] Fixing TranslateBehavior test to run in php4.

---
 cake/libs/model/behaviors/translate.php       |  3 ++-
 .../libs/model/behaviors/translate.test.php   | 20 +++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/cake/libs/model/behaviors/translate.php b/cake/libs/model/behaviors/translate.php
index 24659ef38..1162180ab 100644
--- a/cake/libs/model/behaviors/translate.php
+++ b/cake/libs/model/behaviors/translate.php
@@ -377,7 +377,8 @@ function &translateModel(&$model) {
 		} elseif (empty($model->translateTable) && empty($model->translateModel)) {
 			$this->runtime[$model->alias]['model']->setSource('i18n');
 		}
-		return $this->runtime[$model->alias]['model'];
+		$model =& $this->runtime[$model->alias]['model'];
+		return $model;
 	}
 /**
  * Bind translation for fields, optionally with hasMany association for
diff --git a/cake/tests/cases/libs/model/behaviors/translate.test.php b/cake/tests/cases/libs/model/behaviors/translate.test.php
index 55e13d8af..1231eecb9 100644
--- a/cake/tests/cases/libs/model/behaviors/translate.test.php
+++ b/cake/tests/cases/libs/model/behaviors/translate.test.php
@@ -74,21 +74,25 @@ function testTranslateModel() {
 		$TestModel =& new Tag();
 		$TestModel->translateTable = 'another_i18n';
 		$TestModel->Behaviors->attach('Translate', array('title'));
-		$this->assertEqual($TestModel->translateModel()->name, 'I18nModel');
-		$this->assertEqual($TestModel->translateModel()->useTable, 'another_i18n');
+		$translateModel =& $TestModel->Behaviors->Translate->translateModel($TestModel);
+		$this->assertEqual($translateModel->name, 'I18nModel');
+		$this->assertEqual($translateModel->useTable, 'another_i18n');
 
 		$TestModel =& new User();
 		$TestModel->Behaviors->attach('Translate', array('title'));
-		$this->assertEqual($TestModel->translateModel()->name, 'I18nModel');
-		$this->assertEqual($TestModel->translateModel()->useTable, 'i18n');
+		$translateModel =& $TestModel->Behaviors->Translate->translateModel($TestModel);
+		$this->assertEqual($translateModel->name, 'I18nModel');
+		$this->assertEqual($translateModel->useTable, 'i18n');
 
 		$TestModel =& new TranslatedArticle();
-		$this->assertEqual($TestModel->translateModel()->name, 'TranslateArticleModel');
-		$this->assertEqual($TestModel->translateModel()->useTable, 'article_i18n');
+		$translateModel =& $TestModel->Behaviors->Translate->translateModel($TestModel);
+		$this->assertEqual($translateModel->name, 'TranslateArticleModel');
+		$this->assertEqual($translateModel->useTable, 'article_i18n');
 
 		$TestModel =& new TranslatedItem();
-		$this->assertEqual($TestModel->translateModel()->name, 'TranslateTestModel');
-		$this->assertEqual($TestModel->translateModel()->useTable, 'i18n');
+		$translateModel =& $TestModel->Behaviors->Translate->translateModel($TestModel);
+		$this->assertEqual($translateModel->name, 'TranslateTestModel');
+		$this->assertEqual($translateModel->useTable, 'i18n');
 	}
 /**
  * testLocaleFalsePlain method

From fc304056a31088069157f2d28ac480c02e4b1d9f Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Tue, 26 Jan 2010 13:59:26 -0500
Subject: [PATCH 169/244] Removing Session deletion of nonce token on
 blackhole.  Fixes possible CSRF  risk from multiple submissions of the same
 invalid data.  Refs #214

---
 cake/libs/controller/components/security.php  |  2 --
 .../controller/components/security.test.php   | 20 ++++++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index 52f0d3d9d..5aca459b6 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -381,8 +381,6 @@ function generateDigestResponseHash($data) {
  * @see SecurityComponent::$blackHoleCallback
  */
 	function blackHole(&$controller, $error = '') {
-		$this->Session->del('_Token');
-
 		if ($this->blackHoleCallback == null) {
 			$code = 404;
 			if ($error == 'login') {
diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php
index 111aa0cb9..b1cf605f6 100644
--- a/cake/tests/cases/libs/controller/components/security.test.php
+++ b/cake/tests/cases/libs/controller/components/security.test.php
@@ -237,16 +237,16 @@ function testRequireAuthFail() {
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertTrue($this->Controller->failed);
 
-		$this->Controller->Session->write('_Token', array('allowedControllers' => array()));
+		$this->Controller->Session->write('_Token', serialize(array('allowedControllers' => array())));
 		$this->Controller->data = array('username' => 'willy', 'password' => 'somePass');
 		$this->Controller->action = 'posted';
 		$this->Controller->Security->requireAuth('posted');
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertTrue($this->Controller->failed);
 
-		$this->Controller->Session->write('_Token', array(
+		$this->Controller->Session->write('_Token', serialize(array(
 			'allowedControllers' => array('SecurityTest'), 'allowedActions' => array('posted2')
-		));
+		)));
 		$this->Controller->data = array('username' => 'willy', 'password' => 'somePass');
 		$this->Controller->action = 'posted';
 		$this->Controller->Security->requireAuth('posted');
@@ -1145,5 +1145,19 @@ function testSettingTokenForRequestAction() {
 		$this->Controller->Security->startup($this->Controller);
 		$this->assertEqual($this->Controller->params['_Token']['key'], $key);
 	}
+
+/**
+ * test that blackhole doesn't delete the _Token session key so repeat data submissions
+ * stay blackholed.
+ *
+ * @link http://cakephp.lighthouseapp.com/projects/42648/tickets/214
+ * @return void
+ */
+	function testBlackHoleNotDeletingSessionInformation() {
+		$this->Controller->Security->startup($this->Controller);
+
+		$this->Controller->Security->blackHole($this->Controller, 'auth');
+		$this->assertTrue($this->Controller->Security->Session->check('_Token'), '_Token was deleted by blackHole %s');
+	}
 }
 ?>
\ No newline at end of file

From 527eec1a54ae6952102c79aa5924b38367733a54 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Tue, 26 Jan 2010 14:18:20 -0500
Subject: [PATCH 170/244] Fixing doc tags to make merge easier.

---
 README                                                |  2 +-
 app/config/acl.ini.php                                |  7 +++----
 app/config/bootstrap.php                              |  9 ++++-----
 app/config/core.php                                   |  9 ++++-----
 app/config/database.php.default                       |  9 ++++-----
 app/config/inflections.php                            |  9 ++++-----
 app/config/routes.php                                 |  9 ++++-----
 app/config/sql/db_acl.php                             |  9 ++++-----
 app/config/sql/i18n.php                               |  9 ++++-----
 app/config/sql/sessions.php                           |  9 ++++-----
 app/index.php                                         |  9 ++++-----
 app/webroot/css.php                                   |  9 ++++-----
 app/webroot/css/cake.generic.css                      |  9 ++++-----
 app/webroot/index.php                                 |  9 ++++-----
 app/webroot/js/vendors.php                            |  9 ++++-----
 app/webroot/test.php                                  |  5 ++---
 cake/basics.php                                       |  9 ++++-----
 cake/bootstrap.php                                    |  9 ++++-----
 cake/config/config.php                                |  9 ++++-----
 cake/config/paths.php                                 |  9 ++++-----
 cake/config/unicode/casefolding/0080_00ff.php         |  9 ++++-----
 cake/config/unicode/casefolding/0100_017f.php         |  9 ++++-----
 cake/config/unicode/casefolding/0180_024F.php         |  9 ++++-----
 cake/config/unicode/casefolding/0250_02af.php         |  9 ++++-----
 cake/config/unicode/casefolding/0370_03ff.php         |  9 ++++-----
 cake/config/unicode/casefolding/0400_04ff.php         |  9 ++++-----
 cake/config/unicode/casefolding/0500_052f.php         |  9 ++++-----
 cake/config/unicode/casefolding/0530_058f.php         |  9 ++++-----
 cake/config/unicode/casefolding/1e00_1eff.php         |  9 ++++-----
 cake/config/unicode/casefolding/1f00_1fff.php         |  9 ++++-----
 cake/config/unicode/casefolding/2100_214f.php         |  9 ++++-----
 cake/config/unicode/casefolding/2150_218f.php         |  9 ++++-----
 cake/config/unicode/casefolding/2460_24ff.php         |  9 ++++-----
 cake/config/unicode/casefolding/2c00_2c5f.php         |  9 ++++-----
 cake/config/unicode/casefolding/2c60_2c7f.php         |  9 ++++-----
 cake/config/unicode/casefolding/2c80_2cff.php         |  9 ++++-----
 cake/config/unicode/casefolding/ff00_ffef.php         |  9 ++++-----
 cake/console/cake                                     |  2 +-
 cake/console/cake.bat                                 |  2 +-
 cake/console/cake.php                                 |  7 +++----
 cake/console/error.php                                |  9 ++++-----
 cake/console/libs/acl.php                             |  9 ++++-----
 cake/console/libs/api.php                             |  9 ++++-----
 cake/console/libs/bake.php                            |  9 ++++-----
 cake/console/libs/console.php                         |  9 ++++-----
 cake/console/libs/i18n.php                            |  9 ++++-----
 cake/console/libs/schema.php                          |  9 ++++-----
 cake/console/libs/shell.php                           |  7 +++----
 cake/console/libs/tasks/controller.php                |  7 +++----
 cake/console/libs/tasks/db_config.php                 |  9 ++++-----
 cake/console/libs/tasks/extract.php                   |  9 ++++-----
 cake/console/libs/tasks/model.php                     |  9 ++++-----
 cake/console/libs/tasks/plugin.php                    |  9 ++++-----
 cake/console/libs/tasks/project.php                   |  9 ++++-----
 cake/console/libs/tasks/test.php                      |  9 ++++-----
 cake/console/libs/tasks/view.php                      |  9 ++++-----
 cake/console/libs/templates/skel/app_controller.php   |  9 ++++-----
 cake/console/libs/templates/skel/app_helper.php       |  9 ++++-----
 cake/console/libs/templates/skel/app_model.php        |  9 ++++-----
 cake/console/libs/templates/skel/config/acl.ini.php   |  7 +++----
 cake/console/libs/templates/skel/config/bootstrap.php |  9 ++++-----
 cake/console/libs/templates/skel/config/core.php      |  9 ++++-----
 .../libs/templates/skel/config/database.php.default   |  9 ++++-----
 .../libs/templates/skel/config/inflections.php        |  9 ++++-----
 cake/console/libs/templates/skel/config/routes.php    |  9 ++++-----
 .../console/libs/templates/skel/config/sql/db_acl.php |  9 ++++-----
 cake/console/libs/templates/skel/config/sql/i18n.php  |  9 ++++-----
 .../libs/templates/skel/config/sql/sessions.php       |  9 ++++-----
 .../templates/skel/controllers/pages_controller.php   |  9 ++++-----
 cake/console/libs/templates/skel/index.php            |  9 ++++-----
 .../skel/views/elements/email/html/default.ctp        |  9 ++++-----
 .../skel/views/elements/email/text/default.ctp        |  9 ++++-----
 .../libs/templates/skel/views/layouts/ajax.ctp        |  9 ++++-----
 .../libs/templates/skel/views/layouts/default.ctp     |  9 ++++-----
 .../skel/views/layouts/email/html/default.ctp         |  9 ++++-----
 .../skel/views/layouts/email/text/default.ctp         |  9 ++++-----
 .../libs/templates/skel/views/layouts/flash.ctp       |  9 ++++-----
 cake/console/libs/templates/skel/webroot/css.php      |  9 ++++-----
 .../libs/templates/skel/webroot/css/cake.generic.css  |  9 ++++-----
 cake/console/libs/templates/skel/webroot/index.php    |  9 ++++-----
 .../libs/templates/skel/webroot/js/vendors.php        |  9 ++++-----
 cake/console/libs/templates/skel/webroot/test.php     |  5 ++---
 cake/console/libs/templates/views/form.ctp            |  9 ++++-----
 cake/console/libs/templates/views/index.ctp           |  9 ++++-----
 cake/console/libs/templates/views/view.ctp            |  9 ++++-----
 cake/console/libs/testsuite.php                       |  5 ++---
 cake/dispatcher.php                                   |  7 +++----
 cake/libs/cache.php                                   |  9 ++++-----
 cake/libs/cache/apc.php                               |  9 ++++-----
 cake/libs/cache/file.php                              |  9 ++++-----
 cake/libs/cache/memcache.php                          |  9 ++++-----
 cake/libs/cache/xcache.php                            |  9 ++++-----
 cake/libs/cake_log.php                                |  9 ++++-----
 cake/libs/class_registry.php                          |  9 ++++-----
 cake/libs/configure.php                               |  9 ++++-----
 cake/libs/controller/app_controller.php               |  9 ++++-----
 cake/libs/controller/component.php                    |  9 ++++-----
 cake/libs/controller/components/acl.php               |  9 ++++-----
 cake/libs/controller/components/auth.php              |  9 ++++-----
 cake/libs/controller/components/cookie.php            |  9 ++++-----
 cake/libs/controller/components/email.php             |  9 ++++-----
 cake/libs/controller/components/request_handler.php   |  9 ++++-----
 cake/libs/controller/components/security.php          |  7 +++----
 cake/libs/controller/components/session.php           |  9 ++++-----
 cake/libs/controller/controller.php                   |  9 ++++-----
 cake/libs/controller/pages_controller.php             |  9 ++++-----
 cake/libs/controller/scaffold.php                     |  9 ++++-----
 cake/libs/debugger.php                                |  9 ++++-----
 cake/libs/error.php                                   |  9 ++++-----
 cake/libs/file.php                                    |  9 ++++-----
 cake/libs/flay.php                                    |  9 ++++-----
 cake/libs/folder.php                                  |  9 ++++-----
 cake/libs/http_socket.php                             |  9 ++++-----
 cake/libs/i18n.php                                    |  9 ++++-----
 cake/libs/inflector.php                               |  9 ++++-----
 cake/libs/l10n.php                                    |  9 ++++-----
 cake/libs/magic_db.php                                |  9 ++++-----
 cake/libs/model/app_model.php                         |  9 ++++-----
 cake/libs/model/behavior.php                          |  9 ++++-----
 cake/libs/model/behaviors/acl.php                     |  3 +--
 cake/libs/model/behaviors/containable.php             |  9 ++++-----
 cake/libs/model/behaviors/translate.php               |  9 ++++-----
 cake/libs/model/behaviors/tree.php                    |  3 +--
 cake/libs/model/connection_manager.php                |  9 ++++-----
 cake/libs/model/datasources/datasource.php            |  9 ++++-----
 cake/libs/model/datasources/dbo/dbo_adodb.php         |  9 ++++-----
 cake/libs/model/datasources/dbo/dbo_db2.php           |  7 +++----
 cake/libs/model/datasources/dbo/dbo_firebird.php      |  9 ++++-----
 cake/libs/model/datasources/dbo/dbo_mssql.php         |  9 ++++-----
 cake/libs/model/datasources/dbo/dbo_mysql.php         |  9 ++++-----
 cake/libs/model/datasources/dbo/dbo_mysqli.php        |  9 ++++-----
 cake/libs/model/datasources/dbo/dbo_odbc.php          |  9 ++++-----
 cake/libs/model/datasources/dbo/dbo_oracle.php        |  9 ++++-----
 cake/libs/model/datasources/dbo/dbo_postgres.php      |  9 ++++-----
 cake/libs/model/datasources/dbo/dbo_sqlite.php        |  9 ++++-----
 cake/libs/model/datasources/dbo/dbo_sybase.php        |  9 ++++-----
 cake/libs/model/datasources/dbo_source.php            |  9 ++++-----
 cake/libs/model/db_acl.php                            |  9 ++++-----
 cake/libs/model/model.php                             |  9 ++++-----
 cake/libs/model/schema.php                            |  9 ++++-----
 cake/libs/multibyte.php                               |  9 ++++-----
 cake/libs/object.php                                  |  9 ++++-----
 cake/libs/overloadable.php                            |  9 ++++-----
 cake/libs/overloadable_php4.php                       |  9 ++++-----
 cake/libs/overloadable_php5.php                       |  9 ++++-----
 cake/libs/router.php                                  |  9 ++++-----
 cake/libs/sanitize.php                                |  9 ++++-----
 cake/libs/security.php                                |  9 ++++-----
 cake/libs/session.php                                 |  9 ++++-----
 cake/libs/set.php                                     |  9 ++++-----
 cake/libs/socket.php                                  |  9 ++++-----
 cake/libs/string.php                                  |  9 ++++-----
 cake/libs/validation.php                              |  9 ++++-----
 cake/libs/view/elements/dump.ctp                      |  9 ++++-----
 cake/libs/view/elements/email/html/default.ctp        |  9 ++++-----
 cake/libs/view/elements/email/text/default.ctp        |  9 ++++-----
 cake/libs/view/errors/error404.ctp                    |  9 ++++-----
 cake/libs/view/errors/missing_action.ctp              |  9 ++++-----
 cake/libs/view/errors/missing_component_class.ctp     |  9 ++++-----
 cake/libs/view/errors/missing_component_file.ctp      |  9 ++++-----
 cake/libs/view/errors/missing_connection.ctp          |  9 ++++-----
 cake/libs/view/errors/missing_controller.ctp          |  9 ++++-----
 cake/libs/view/errors/missing_helper_class.ctp        |  9 ++++-----
 cake/libs/view/errors/missing_helper_file.ctp         |  9 ++++-----
 cake/libs/view/errors/missing_layout.ctp              |  9 ++++-----
 cake/libs/view/errors/missing_model.ctp               |  9 ++++-----
 cake/libs/view/errors/missing_scaffolddb.ctp          |  9 ++++-----
 cake/libs/view/errors/missing_table.ctp               |  9 ++++-----
 cake/libs/view/errors/missing_view.ctp                |  9 ++++-----
 cake/libs/view/errors/private_action.ctp              |  9 ++++-----
 cake/libs/view/errors/scaffold_error.ctp              |  9 ++++-----
 cake/libs/view/helper.php                             |  9 ++++-----
 cake/libs/view/helpers/ajax.php                       |  9 ++++-----
 cake/libs/view/helpers/app_helper.php                 |  9 ++++-----
 cake/libs/view/helpers/cache.php                      |  9 ++++-----
 cake/libs/view/helpers/form.php                       |  9 ++++-----
 cake/libs/view/helpers/html.php                       |  9 ++++-----
 cake/libs/view/helpers/javascript.php                 |  9 ++++-----
 cake/libs/view/helpers/js.php                         |  3 +--
 cake/libs/view/helpers/number.php                     |  9 ++++-----
 cake/libs/view/helpers/paginator.php                  |  9 ++++-----
 cake/libs/view/helpers/rss.php                        |  9 ++++-----
 cake/libs/view/helpers/session.php                    |  9 ++++-----
 cake/libs/view/helpers/text.php                       |  9 ++++-----
 cake/libs/view/helpers/time.php                       |  9 ++++-----
 cake/libs/view/helpers/xml.php                        |  9 ++++-----
 cake/libs/view/layouts/ajax.ctp                       |  9 ++++-----
 cake/libs/view/layouts/default.ctp                    |  9 ++++-----
 cake/libs/view/layouts/email/html/default.ctp         |  9 ++++-----
 cake/libs/view/layouts/email/text/default.ctp         |  9 ++++-----
 cake/libs/view/layouts/flash.ctp                      |  9 ++++-----
 cake/libs/view/media.php                              |  9 ++++-----
 cake/libs/view/pages/home.ctp                         | 11 +++++------
 cake/libs/view/scaffolds/edit.ctp                     |  9 ++++-----
 cake/libs/view/scaffolds/index.ctp                    |  9 ++++-----
 cake/libs/view/scaffolds/view.ctp                     |  9 ++++-----
 cake/libs/view/theme.php                              |  9 ++++-----
 cake/libs/view/view.php                               |  9 ++++-----
 cake/libs/xml.php                                     |  9 ++++-----
 cake/tests/cases/basics.test.php                      |  5 ++---
 cake/tests/cases/console/cake.test.php                |  1 -
 cake/tests/cases/console/libs/acl.test.php            |  3 +--
 cake/tests/cases/console/libs/api.test.php            |  3 +--
 cake/tests/cases/console/libs/schema.test.php         |  3 +--
 cake/tests/cases/console/libs/shell.test.php          |  3 +--
 cake/tests/cases/console/libs/tasks/extract.test.php  |  3 +--
 cake/tests/cases/console/libs/tasks/model.test.php    |  3 +--
 cake/tests/cases/console/libs/tasks/test.test.php     |  3 +--
 cake/tests/cases/dispatcher.test.php                  |  5 ++---
 cake/tests/cases/libs/cache.test.php                  |  5 ++---
 cake/tests/cases/libs/cache/apc.test.php              |  5 ++---
 cake/tests/cases/libs/cache/file.test.php             |  5 ++---
 cake/tests/cases/libs/cache/memcache.test.php         |  5 ++---
 cake/tests/cases/libs/cache/xcache.test.php           |  5 ++---
 cake/tests/cases/libs/cake_log.test.php               |  5 ++---
 cake/tests/cases/libs/cake_test_case.test.php         |  3 +--
 cake/tests/cases/libs/cake_test_fixture.test.php      |  5 ++---
 cake/tests/cases/libs/class_registry.test.php         |  5 ++---
 cake/tests/cases/libs/code_coverage_manager.test.php  |  5 ++---
 cake/tests/cases/libs/configure.test.php              |  5 ++---
 cake/tests/cases/libs/controller/component.test.php   |  5 ++---
 .../cases/libs/controller/components/acl.test.php     |  5 ++---
 .../cases/libs/controller/components/auth.test.php    |  5 ++---
 .../cases/libs/controller/components/cookie.test.php  |  5 ++---
 .../cases/libs/controller/components/email.test.php   |  5 ++---
 .../controller/components/request_handler.test.php    |  5 ++---
 .../libs/controller/components/security.test.php      |  5 ++---
 .../cases/libs/controller/components/session.test.php |  5 ++---
 cake/tests/cases/libs/controller/controller.test.php  |  5 ++---
 .../libs/controller/controller_merge_vars.test.php    |  5 ++---
 .../cases/libs/controller/pages_controller.test.php   |  5 ++---
 cake/tests/cases/libs/controller/scaffold.test.php    |  5 ++---
 cake/tests/cases/libs/debugger.test.php               |  5 ++---
 cake/tests/cases/libs/error.test.php                  |  5 ++---
 cake/tests/cases/libs/file.test.php                   |  5 ++---
 cake/tests/cases/libs/flay.test.php                   |  5 ++---
 cake/tests/cases/libs/folder.test.php                 |  5 ++---
 cake/tests/cases/libs/http_socket.test.php            |  5 ++---
 cake/tests/cases/libs/i18n.test.php                   |  5 ++---
 cake/tests/cases/libs/inflector.test.php              |  5 ++---
 cake/tests/cases/libs/l10n.test.php                   |  5 ++---
 cake/tests/cases/libs/magic_db.test.php               |  9 ++++-----
 cake/tests/cases/libs/model/behavior.test.php         |  1 -
 cake/tests/cases/libs/model/behaviors/acl.test.php    |  3 +--
 .../cases/libs/model/behaviors/containable.test.php   |  5 ++---
 .../cases/libs/model/behaviors/translate.test.php     |  5 ++---
 cake/tests/cases/libs/model/behaviors/tree.test.php   |  5 ++---
 .../cases/libs/model/connection_manager.test.php      |  5 ++---
 .../libs/model/datasources/dbo/dbo_adodb.test.php     |  9 ++++-----
 .../libs/model/datasources/dbo/dbo_mssql.test.php     |  9 ++++-----
 .../libs/model/datasources/dbo/dbo_mysql.test.php     |  9 ++++-----
 .../libs/model/datasources/dbo/dbo_mysqli.test.php    |  9 ++++-----
 .../libs/model/datasources/dbo/dbo_oracle.test.php    |  9 ++++-----
 .../libs/model/datasources/dbo/dbo_postgres.test.php  |  9 ++++-----
 .../libs/model/datasources/dbo/dbo_sqlite.test.php    |  9 ++++-----
 .../cases/libs/model/datasources/dbo_source.test.php  |  5 ++---
 cake/tests/cases/libs/model/db_acl.test.php           |  5 ++---
 cake/tests/cases/libs/model/model.test.php            |  5 ++---
 cake/tests/cases/libs/model/model_delete.test.php     |  5 ++---
 .../tests/cases/libs/model/model_integration.test.php |  5 ++---
 cake/tests/cases/libs/model/model_read.test.php       |  5 ++---
 cake/tests/cases/libs/model/model_validation.test.php |  5 ++---
 cake/tests/cases/libs/model/model_write.test.php      |  5 ++---
 cake/tests/cases/libs/model/models.php                |  5 ++---
 cake/tests/cases/libs/model/schema.test.php           |  5 ++---
 cake/tests/cases/libs/multibyte.test.php              |  5 ++---
 cake/tests/cases/libs/object.test.php                 |  5 ++---
 cake/tests/cases/libs/overloadable.test.php           |  5 ++---
 cake/tests/cases/libs/router.test.php                 |  5 ++---
 cake/tests/cases/libs/sanitize.test.php               |  5 ++---
 cake/tests/cases/libs/security.test.php               |  5 ++---
 cake/tests/cases/libs/session.test.php                |  5 ++---
 cake/tests/cases/libs/set.test.php                    |  5 ++---
 cake/tests/cases/libs/socket.test.php                 |  5 ++---
 cake/tests/cases/libs/string.test.php                 |  5 ++---
 cake/tests/cases/libs/test_manager.test.php           |  3 +--
 cake/tests/cases/libs/validation.test.php             |  5 ++---
 cake/tests/cases/libs/view/helper.test.php            |  5 ++---
 cake/tests/cases/libs/view/helpers/ajax.test.php      |  5 ++---
 cake/tests/cases/libs/view/helpers/cache.test.php     |  5 ++---
 cake/tests/cases/libs/view/helpers/form.test.php      |  1 -
 cake/tests/cases/libs/view/helpers/html.test.php      |  1 -
 .../tests/cases/libs/view/helpers/javascript.test.php |  1 -
 cake/tests/cases/libs/view/helpers/js.test.php        |  5 ++---
 cake/tests/cases/libs/view/helpers/number.test.php    |  5 ++---
 cake/tests/cases/libs/view/helpers/paginator.test.php |  5 ++---
 cake/tests/cases/libs/view/helpers/rss.test.php       |  5 ++---
 cake/tests/cases/libs/view/helpers/session.test.php   |  5 ++---
 cake/tests/cases/libs/view/helpers/text.test.php      |  5 ++---
 cake/tests/cases/libs/view/helpers/time.test.php      |  5 ++---
 cake/tests/cases/libs/view/helpers/xml.test.php       |  5 ++---
 cake/tests/cases/libs/view/theme.test.php             |  5 ++---
 cake/tests/cases/libs/view/view.test.php              |  5 ++---
 cake/tests/cases/libs/xml.test.php                    |  5 ++---
 cake/tests/fixtures/account_fixture.php               |  5 ++---
 cake/tests/fixtures/aco_action_fixture.php            |  5 ++---
 cake/tests/fixtures/aco_fixture.php                   |  5 ++---
 cake/tests/fixtures/aco_two_fixture.php               |  5 ++---
 cake/tests/fixtures/ad_fixture.php                    |  1 -
 cake/tests/fixtures/advertisement_fixture.php         |  5 ++---
 cake/tests/fixtures/after_tree_fixture.php            |  1 -
 cake/tests/fixtures/another_article_fixture.php       |  5 ++---
 cake/tests/fixtures/apple_fixture.php                 |  5 ++---
 cake/tests/fixtures/aro_fixture.php                   |  5 ++---
 cake/tests/fixtures/aro_two_fixture.php               |  5 ++---
 cake/tests/fixtures/aros_aco_fixture.php              |  5 ++---
 cake/tests/fixtures/aros_aco_two_fixture.php          |  5 ++---
 cake/tests/fixtures/article_featured_fixture.php      |  5 ++---
 .../tests/fixtures/article_featureds_tags_fixture.php |  5 ++---
 cake/tests/fixtures/article_fixture.php               |  5 ++---
 cake/tests/fixtures/articles_tag_fixture.php          |  5 ++---
 cake/tests/fixtures/attachment_fixture.php            |  5 ++---
 .../tests/fixtures/auth_user_custom_field_fixture.php |  5 ++---
 cake/tests/fixtures/auth_user_fixture.php             |  5 ++---
 cake/tests/fixtures/author_fixture.php                |  5 ++---
 cake/tests/fixtures/basket_fixture.php                |  5 ++---
 cake/tests/fixtures/bid_fixture.php                   |  5 ++---
 cake/tests/fixtures/binary_test_fixture.php           |  5 ++---
 cake/tests/fixtures/book_fixture.php                  |  5 ++---
 cake/tests/fixtures/cache_test_model_fixture.php      |  5 ++---
 cake/tests/fixtures/callback_fixture.php              |  5 ++---
 cake/tests/fixtures/campaign_fixture.php              |  1 -
 cake/tests/fixtures/category_fixture.php              |  5 ++---
 cake/tests/fixtures/category_thread_fixture.php       |  5 ++---
 cake/tests/fixtures/cd_fixture.php                    |  5 ++---
 cake/tests/fixtures/comment_fixture.php               |  5 ++---
 cake/tests/fixtures/content_account_fixture.php       |  5 ++---
 cake/tests/fixtures/content_fixture.php               |  5 ++---
 cake/tests/fixtures/counter_cache_post_fixture.php    |  5 ++---
 ...ter_cache_post_nonstandard_primary_key_fixture.php |  5 ++---
 cake/tests/fixtures/counter_cache_user_fixture.php    |  5 ++---
 ...ter_cache_user_nonstandard_primary_key_fixture.php |  5 ++---
 cake/tests/fixtures/data_test_fixture.php             |  5 ++---
 cake/tests/fixtures/datatype_fixture.php              |  9 ++++-----
 cake/tests/fixtures/dependency_fixture.php            |  9 ++++-----
 cake/tests/fixtures/device_fixture.php                |  5 ++---
 cake/tests/fixtures/device_type_category_fixture.php  |  5 ++---
 cake/tests/fixtures/device_type_fixture.php           |  5 ++---
 cake/tests/fixtures/document_directory_fixture.php    |  5 ++---
 cake/tests/fixtures/document_fixture.php              |  5 ++---
 .../tests/fixtures/exterior_type_category_fixture.php |  5 ++---
 cake/tests/fixtures/feature_set_fixture.php           |  5 ++---
 cake/tests/fixtures/featured_fixture.php              |  5 ++---
 cake/tests/fixtures/film_file_fixture.php             |  5 ++---
 cake/tests/fixtures/flag_tree_fixture.php             |  5 ++---
 cake/tests/fixtures/fruit_fixture.php                 |  5 ++---
 cake/tests/fixtures/fruits_uuid_tag_fixture.php       |  5 ++---
 cake/tests/fixtures/home_fixture.php                  |  5 ++---
 cake/tests/fixtures/image_fixture.php                 |  5 ++---
 cake/tests/fixtures/item_fixture.php                  |  5 ++---
 cake/tests/fixtures/items_portfolio_fixture.php       |  5 ++---
 cake/tests/fixtures/join_a_b_fixture.php              |  5 ++---
 cake/tests/fixtures/join_a_c_fixture.php              |  5 ++---
 cake/tests/fixtures/join_a_fixture.php                |  5 ++---
 cake/tests/fixtures/join_b_fixture.php                |  5 ++---
 cake/tests/fixtures/join_c_fixture.php                |  5 ++---
 cake/tests/fixtures/join_thing_fixture.php            |  5 ++---
 cake/tests/fixtures/message_fixture.php               |  5 ++---
 .../fixtures/my_categories_my_products_fixture.php    |  5 ++---
 .../tests/fixtures/my_categories_my_users_fixture.php |  5 ++---
 cake/tests/fixtures/my_category_fixture.php           |  5 ++---
 cake/tests/fixtures/my_product_fixture.php            |  5 ++---
 cake/tests/fixtures/my_user_fixture.php               |  5 ++---
 cake/tests/fixtures/node_fixture.php                  |  9 ++++-----
 cake/tests/fixtures/number_tree_fixture.php           |  5 ++---
 cake/tests/fixtures/number_tree_two_fixture.php       |  5 ++---
 cake/tests/fixtures/numeric_article_fixture.php       |  5 ++---
 cake/tests/fixtures/overall_favorite_fixture.php      |  5 ++---
 cake/tests/fixtures/person_fixture.php                |  5 ++---
 cake/tests/fixtures/portfolio_fixture.php             |  5 ++---
 cake/tests/fixtures/post_fixture.php                  |  5 ++---
 cake/tests/fixtures/posts_tag_fixture.php             |  5 ++---
 cake/tests/fixtures/primary_model_fixture.php         |  5 ++---
 cake/tests/fixtures/product_fixture.php               |  5 ++---
 cake/tests/fixtures/project_fixture.php               |  5 ++---
 cake/tests/fixtures/sample_fixture.php                |  5 ++---
 cake/tests/fixtures/secondary_model_fixture.php       |  5 ++---
 cake/tests/fixtures/session_fixture.php               |  5 ++---
 cake/tests/fixtures/something_else_fixture.php        |  5 ++---
 cake/tests/fixtures/something_fixture.php             |  5 ++---
 cake/tests/fixtures/stories_tag_fixture.php           |  5 ++---
 cake/tests/fixtures/story_fixture.php                 |  5 ++---
 cake/tests/fixtures/syfile_fixture.php                |  5 ++---
 cake/tests/fixtures/tag_fixture.php                   |  5 ++---
 cake/tests/fixtures/test_plugin_article_fixture.php   |  5 ++---
 cake/tests/fixtures/test_plugin_comment_fixture.php   |  5 ++---
 cake/tests/fixtures/the_paper_monkies_fixture.php     |  5 ++---
 cake/tests/fixtures/thread_fixture.php                |  5 ++---
 cake/tests/fixtures/translate_article_fixture.php     |  5 ++---
 cake/tests/fixtures/translate_fixture.php             |  5 ++---
 cake/tests/fixtures/translate_table_fixture.php       |  5 ++---
 cake/tests/fixtures/translate_with_prefix_fixture.php |  5 ++---
 cake/tests/fixtures/translated_article_fixture.php    |  5 ++---
 cake/tests/fixtures/translated_item_fixture.php       |  5 ++---
 cake/tests/fixtures/unconventional_tree_fixture.php   |  5 ++---
 cake/tests/fixtures/underscore_field_fixture.php      |  5 ++---
 cake/tests/fixtures/user_fixture.php                  |  5 ++---
 cake/tests/fixtures/uuid_fixture.php                  |  5 ++---
 cake/tests/fixtures/uuid_tag_fixture.php              |  5 ++---
 cake/tests/fixtures/uuid_tree_fixture.php             |  5 ++---
 cake/tests/fixtures/uuiditem_fixture.php              |  5 ++---
 .../fixtures/uuiditems_uuidportfolio_fixture.php      |  5 ++---
 .../uuiditems_uuidportfolio_numericid_fixture.php     |  5 ++---
 cake/tests/fixtures/uuidportfolio_fixture.php         |  5 ++---
 cake/tests/groups/acl.group.php                       |  5 ++---
 cake/tests/groups/cache.group.php                     |  5 ++---
 cake/tests/groups/components.group.php                |  5 ++---
 cake/tests/groups/configure.group.php                 |  5 ++---
 cake/tests/groups/console.group.php                   |  5 ++---
 cake/tests/groups/controller.group.php                |  5 ++---
 cake/tests/groups/database.group.php                  |  5 ++---
 cake/tests/groups/helpers.group.php                   |  5 ++---
 cake/tests/groups/lib.group.php                       |  5 ++---
 cake/tests/groups/model.group.php                     |  5 ++---
 cake/tests/groups/no_cross_contamination.group.php    |  5 ++---
 cake/tests/groups/routing_system.group.php            |  5 ++---
 cake/tests/groups/socket.group.php                    |  1 -
 cake/tests/groups/test_suite.group.php                |  1 -
 cake/tests/groups/view.group.php                      |  5 ++---
 cake/tests/groups/xml.group.php                       |  5 ++---
 cake/tests/lib/cake_reporter.php                      |  5 ++---
 cake/tests/lib/cake_test_case.php                     |  5 ++---
 cake/tests/lib/cake_test_fixture.php                  |  5 ++---
 cake/tests/lib/cake_test_model.php                    |  5 ++---
 cake/tests/lib/cake_web_test_case.php                 |  5 ++---
 cake/tests/lib/cli_reporter.php                       |  5 ++---
 cake/tests/lib/code_coverage_manager.php              |  5 ++---
 cake/tests/lib/content.php                            |  5 ++---
 cake/tests/lib/footer.php                             |  5 ++---
 cake/tests/lib/header.php                             |  5 ++---
 cake/tests/lib/simpletest.php                         |  5 ++---
 cake/tests/lib/test_manager.php                       |  5 ++---
 cake/tests/lib/xdebug.php                             |  5 ++---
 cake/tests/test_app/config/acl.ini.php                |  9 ++++-----
 .../test_app/controllers/tests_apps_controller.php    |  5 ++---
 .../controllers/tests_apps_posts_controller.php       |  5 ++---
 .../models/behaviors/persister_one_behavior.php       |  9 ++++-----
 .../models/behaviors/persister_two_behavior.php       |  9 ++++-----
 cake/tests/test_app/models/comment.php                |  3 +--
 cake/tests/test_app/models/persister_one.php          |  3 +--
 cake/tests/test_app/models/persister_two.php          |  3 +--
 cake/tests/test_app/models/post.php                   |  3 +--
 .../controllers/components/other_component.php        |  5 ++---
 .../controllers/components/plugins_component.php      |  5 ++---
 .../controllers/components/test_plugin_component.php  |  5 ++---
 .../components/test_plugin_other_component.php        |  5 ++---
 .../test_plugin/controllers/tests_controller.php      |  5 ++---
 .../models/behaviors/test_plugin_persister_one.php    |  9 ++++-----
 .../models/behaviors/test_plugin_persister_two.php    |  9 ++++-----
 .../test_plugin/models/test_plugin_authors.php        |  3 +--
 .../test_plugin/models/test_plugin_comment.php        |  3 +--
 .../plugins/test_plugin/models/test_plugin_post.php   |  3 +--
 .../test_plugin/test_plugin_app_controller.php        |  5 ++---
 .../plugins/test_plugin/test_plugin_app_model.php     |  5 ++---
 .../test_plugin/vendors/sample/sample_plugin.php      |  5 ++---
 .../plugins/test_plugin/vendors/shells/example.php    |  5 ++---
 .../test_app/plugins/test_plugin/vendors/welcome.php  |  5 ++---
 .../test_plugin/views/helpers/other_helper.php        |  5 ++---
 .../test_plugin/views/helpers/plugged_helper.php      |  5 ++---
 .../test_plugin_two/vendors/shells/example.php        |  5 ++---
 .../test_plugin_two/vendors/shells/welcome.php        |  5 ++---
 cake/tests/test_app/vendors/Test/MyTest.php           |  5 ++---
 cake/tests/test_app/vendors/Test/hello.php            |  5 ++---
 .../vendors/sample/configure_test_vendor_sample.php   |  5 ++---
 cake/tests/test_app/vendors/shells/sample.php         |  5 ++---
 cake/tests/test_app/vendors/somename/some.name.php    |  5 ++---
 cake/tests/test_app/vendors/welcome.php               |  5 ++---
 .../test_app/views/elements/email/html/default.ctp    |  9 ++++-----
 .../test_app/views/elements/email/text/default.ctp    |  9 ++++-----
 .../tests/test_app/views/elements/email/text/wide.ctp |  9 ++++-----
 cake/tests/test_app/views/layouts/ajax.ctp            |  9 ++++-----
 cake/tests/test_app/views/layouts/ajax2.ctp           |  9 ++++-----
 cake/tests/test_app/views/layouts/cache_layout.ctp    |  9 ++++-----
 cake/tests/test_app/views/layouts/default.ctp         |  9 ++++-----
 .../test_app/views/layouts/email/html/default.ctp     |  9 ++++-----
 cake/tests/test_app/views/layouts/email/html/thin.ctp |  9 ++++-----
 .../test_app/views/layouts/email/text/default.ctp     |  9 ++++-----
 cake/tests/test_app/views/layouts/flash.ctp           |  9 ++++-----
 cake/tests/test_app/views/layouts/multi_cache.ctp     |  9 ++++-----
 .../tests/test_app/views/posts/sequencial_nocache.ctp |  9 ++++-----
 cake/tests/test_app/views/posts/test_nocache_tags.ctp | 11 +++++------
 index.php                                             |  7 +++----
 482 files changed, 1356 insertions(+), 1835 deletions(-)

diff --git a/README b/README
index 5fe134356..b92cb46e9 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC. Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.
 
 The Cake Software Foundation - promoting development related to CakePHP
-http://www.cakefoundation.org/
+http://cakefoundation.org/
 
 CakePHP - the rapid development PHP framework
 http://www.cakephp.org
diff --git a/app/config/acl.ini.php b/app/config/acl.ini.php
index c0e3a9b7a..a6e9c97fb 100644
--- a/app/config/acl.ini.php
+++ b/app/config/acl.ini.php
@@ -7,14 +7,13 @@
 ; * PHP versions 4 and 5
 ; *
 ; * CakePHP(tm) :  Rapid Development Framework http://www.cakephp.org/
-; * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+; * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
 ; *
 ; *  Licensed under The MIT License
 ; *  Redistributions of files must retain the above copyright notice.
 ; *
-; * @filesource
-; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
-; * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+; * @link          http://cakephp.org CakePHP(tm) Project
 ; * @package       cake
 ; * @subpackage    cake.app.config
 ; * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/app/config/bootstrap.php b/app/config/bootstrap.php
index bede17125..22bd4a938 100644
--- a/app/config/bootstrap.php
+++ b/app/config/bootstrap.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
  * @since         CakePHP(tm) v 0.10.8.2117
diff --git a/app/config/core.php b/app/config/core.php
index 7e078fc96..283eba4d1 100644
--- a/app/config/core.php
+++ b/app/config/core.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
  * @since         CakePHP(tm) v 0.2.9
diff --git a/app/config/database.php.default b/app/config/database.php.default
index ac3e99dfe..c30e368ae 100644
--- a/app/config/database.php.default
+++ b/app/config/database.php.default
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
  * @since         CakePHP(tm) v 0.2.9
diff --git a/app/config/inflections.php b/app/config/inflections.php
index ccbb0e793..2c73fd884 100644
--- a/app/config/inflections.php
+++ b/app/config/inflections.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and %
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
  * @since         CakePHP(tm) v 1.0.0.2312
diff --git a/app/config/routes.php b/app/config/routes.php
index 1bec77b10..32094aa62 100644
--- a/app/config/routes.php
+++ b/app/config/routes.php
@@ -9,15 +9,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
  * @since         CakePHP(tm) v 0.2.9
diff --git a/app/config/sql/db_acl.php b/app/config/sql/db_acl.php
index dd6a1ac1b..72530d65c 100644
--- a/app/config/sql/db_acl.php
+++ b/app/config/sql/db_acl.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config.sql
  * @since         CakePHP(tm) v 0.2.9
diff --git a/app/config/sql/i18n.php b/app/config/sql/i18n.php
index 40c2957fe..ac0e7f5a9 100644
--- a/app/config/sql/i18n.php
+++ b/app/config/sql/i18n.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config.sql
  * @since         CakePHP(tm) v 0.2.9
diff --git a/app/config/sql/sessions.php b/app/config/sql/sessions.php
index 334c0b9ce..8880e49b5 100644
--- a/app/config/sql/sessions.php
+++ b/app/config/sql/sessions.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config.sql
  * @since         CakePHP(tm) v 0.2.9
diff --git a/app/index.php b/app/index.php
index 057c1af3a..a8cca5d89 100644
--- a/app/index.php
+++ b/app/index.php
@@ -3,15 +3,14 @@
 /**
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/app/webroot/css.php b/app/webroot/css.php
index 15dba4ae8..bb29d0362 100644
--- a/app/webroot/css.php
+++ b/app/webroot/css.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot
  * @since         CakePHP(tm) v 0.2.9
diff --git a/app/webroot/css/cake.generic.css b/app/webroot/css/cake.generic.css
index 13df20602..3c244c5ba 100644
--- a/app/webroot/css/cake.generic.css
+++ b/app/webroot/css/cake.generic.css
@@ -3,15 +3,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot.css
  * @since         CakePHP(tm)
diff --git a/app/webroot/index.php b/app/webroot/index.php
index 9d2113576..8608f07dd 100644
--- a/app/webroot/index.php
+++ b/app/webroot/index.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot
  * @since         CakePHP(tm) v 0.2.9
diff --git a/app/webroot/js/vendors.php b/app/webroot/js/vendors.php
index 5c6181290..d9d38f690 100644
--- a/app/webroot/js/vendors.php
+++ b/app/webroot/js/vendors.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot.js
  * @since         CakePHP(tm) v 0.2.9
diff --git a/app/webroot/test.php b/app/webroot/test.php
index 665def442..de8fb027f 100644
--- a/app/webroot/test.php
+++ b/app/webroot/test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/basics.php b/cake/basics.php
index 530dd2252..19cfc5bbb 100644
--- a/cake/basics.php
+++ b/cake/basics.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/bootstrap.php b/cake/bootstrap.php
index 1652b085f..473530fd6 100644
--- a/cake/bootstrap.php
+++ b/cake/bootstrap.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/config/config.php b/cake/config/config.php
index f4f248de0..ce1b9ba83 100644
--- a/cake/config/config.php
+++ b/cake/config/config.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
  * @since         CakePHP(tm) v 1.1.11.4062
diff --git a/cake/config/paths.php b/cake/config/paths.php
index 727b36cca..781ce0ce9 100644
--- a/cake/config/paths.php
+++ b/cake/config/paths.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.app.config
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/config/unicode/casefolding/0080_00ff.php b/cake/config/unicode/casefolding/0080_00ff.php
index 730c97086..a3917c776 100644
--- a/cake/config/unicode/casefolding/0080_00ff.php
+++ b/cake/config/unicode/casefolding/0080_00ff.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/0100_017f.php b/cake/config/unicode/casefolding/0100_017f.php
index aa092f719..e3df9f639 100644
--- a/cake/config/unicode/casefolding/0100_017f.php
+++ b/cake/config/unicode/casefolding/0100_017f.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/0180_024F.php b/cake/config/unicode/casefolding/0180_024F.php
index 948eb8906..73fb18d7d 100644
--- a/cake/config/unicode/casefolding/0180_024F.php
+++ b/cake/config/unicode/casefolding/0180_024F.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/0250_02af.php b/cake/config/unicode/casefolding/0250_02af.php
index 62cf773af..df1b95321 100644
--- a/cake/config/unicode/casefolding/0250_02af.php
+++ b/cake/config/unicode/casefolding/0250_02af.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.6833
diff --git a/cake/config/unicode/casefolding/0370_03ff.php b/cake/config/unicode/casefolding/0370_03ff.php
index c088320ef..aff493514 100644
--- a/cake/config/unicode/casefolding/0370_03ff.php
+++ b/cake/config/unicode/casefolding/0370_03ff.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/0400_04ff.php b/cake/config/unicode/casefolding/0400_04ff.php
index 3e3cf8d98..4b789a8ae 100644
--- a/cake/config/unicode/casefolding/0400_04ff.php
+++ b/cake/config/unicode/casefolding/0400_04ff.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/0500_052f.php b/cake/config/unicode/casefolding/0500_052f.php
index 1e5449ec5..6747ce752 100644
--- a/cake/config/unicode/casefolding/0500_052f.php
+++ b/cake/config/unicode/casefolding/0500_052f.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/0530_058f.php b/cake/config/unicode/casefolding/0530_058f.php
index 599b8516c..68f3c6562 100644
--- a/cake/config/unicode/casefolding/0530_058f.php
+++ b/cake/config/unicode/casefolding/0530_058f.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/1e00_1eff.php b/cake/config/unicode/casefolding/1e00_1eff.php
index cdd24c36f..12f58212a 100644
--- a/cake/config/unicode/casefolding/1e00_1eff.php
+++ b/cake/config/unicode/casefolding/1e00_1eff.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/1f00_1fff.php b/cake/config/unicode/casefolding/1f00_1fff.php
index 39bebc63b..59a451ae0 100644
--- a/cake/config/unicode/casefolding/1f00_1fff.php
+++ b/cake/config/unicode/casefolding/1f00_1fff.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/2100_214f.php b/cake/config/unicode/casefolding/2100_214f.php
index eb801c35c..c39d3ff2d 100644
--- a/cake/config/unicode/casefolding/2100_214f.php
+++ b/cake/config/unicode/casefolding/2100_214f.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/2150_218f.php b/cake/config/unicode/casefolding/2150_218f.php
index dcff6df50..0cc85d0ee 100644
--- a/cake/config/unicode/casefolding/2150_218f.php
+++ b/cake/config/unicode/casefolding/2150_218f.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/2460_24ff.php b/cake/config/unicode/casefolding/2460_24ff.php
index e7e675373..ff9508812 100644
--- a/cake/config/unicode/casefolding/2460_24ff.php
+++ b/cake/config/unicode/casefolding/2460_24ff.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/2c00_2c5f.php b/cake/config/unicode/casefolding/2c00_2c5f.php
index e27abdf82..f7c97b85d 100644
--- a/cake/config/unicode/casefolding/2c00_2c5f.php
+++ b/cake/config/unicode/casefolding/2c00_2c5f.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/2c60_2c7f.php b/cake/config/unicode/casefolding/2c60_2c7f.php
index 3d3553a52..ca1d527eb 100644
--- a/cake/config/unicode/casefolding/2c60_2c7f.php
+++ b/cake/config/unicode/casefolding/2c60_2c7f.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/2c80_2cff.php b/cake/config/unicode/casefolding/2c80_2cff.php
index df9879c55..bad418bcb 100644
--- a/cake/config/unicode/casefolding/2c80_2cff.php
+++ b/cake/config/unicode/casefolding/2c80_2cff.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/config/unicode/casefolding/ff00_ffef.php b/cake/config/unicode/casefolding/ff00_ffef.php
index 530f0e75c..f4facbe76 100644
--- a/cake/config/unicode/casefolding/ff00_ffef.php
+++ b/cake/config/unicode/casefolding/ff00_ffef.php
@@ -11,15 +11,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.config.unicode.casefolding
  * @since         CakePHP(tm) v 1.2.0.5691
diff --git a/cake/console/cake b/cake/console/cake
index 0edff7e8f..890457ba6 100755
--- a/cake/console/cake
+++ b/cake/console/cake
@@ -12,7 +12,7 @@
 #
 # @filesource
 # @copyright		Copyright 2005-2010, Cake Software Foundation, Inc.
-# @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+# @link				http://cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
 # @package			cake
 # @subpackage		cake.cake.console
 # @since				CakePHP(tm) v 1.2.0.5012
diff --git a/cake/console/cake.bat b/cake/console/cake.bat
index 35c1a2b83..09701dea7 100644
--- a/cake/console/cake.bat
+++ b/cake/console/cake.bat
@@ -11,7 +11,7 @@
 ::
 :: @filesource
 :: @copyright		Copyright 2005-2010, Cake Software Foundation, Inc.
-:: @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+:: @link				http://cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
 :: @package			cake
 :: @subpackage		cake.cake.console
 :: @since			CakePHP(tm) v 1.2.0.5012
diff --git a/cake/console/cake.php b/cake/console/cake.php
index e90f7e555..517437069 100644
--- a/cake/console/cake.php
+++ b/cake/console/cake.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
  * Copyright 2005-2010,	Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console
  * @since         CakePHP(tm) v 1.2.0.5012
diff --git a/cake/console/error.php b/cake/console/error.php
index 788fe3611..1eebc436f 100644
--- a/cake/console/error.php
+++ b/cake/console/error.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console
  * @since         CakePHP(tm) v 1.2.0.5074
diff --git a/cake/console/libs/acl.php b/cake/console/libs/acl.php
index f7d8c4ae1..74d4895ff 100644
--- a/cake/console/libs/acl.php
+++ b/cake/console/libs/acl.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5012
diff --git a/cake/console/libs/api.php b/cake/console/libs/api.php
index b3a34755f..593e90d84 100644
--- a/cake/console/libs/api.php
+++ b/cake/console/libs/api.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5012
diff --git a/cake/console/libs/bake.php b/cake/console/libs/bake.php
index a80cf775e..cf20acff0 100644
--- a/cake/console/libs/bake.php
+++ b/cake/console/libs/bake.php
@@ -9,15 +9,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5012
diff --git a/cake/console/libs/console.php b/cake/console/libs/console.php
index ea5508584..56f90c23f 100644
--- a/cake/console/libs/console.php
+++ b/cake/console/libs/console.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5012
diff --git a/cake/console/libs/i18n.php b/cake/console/libs/i18n.php
index 70ffd61b3..875c63ff5 100644
--- a/cake/console/libs/i18n.php
+++ b/cake/console/libs/i18n.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5669
diff --git a/cake/console/libs/schema.php b/cake/console/libs/schema.php
index c7cf5cfcf..1c643fa98 100644
--- a/cake/console/libs/schema.php
+++ b/cake/console/libs/schema.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5550
diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php
index 8f5c7a6eb..4e477f1af 100644
--- a/cake/console/libs/shell.php
+++ b/cake/console/libs/shell.php
@@ -8,14 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5012
diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index fcc367998..404f5cacd 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
  * Copyright 2005-2010,	Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
diff --git a/cake/console/libs/tasks/db_config.php b/cake/console/libs/tasks/db_config.php
index e0844a5d9..a19eb6114 100644
--- a/cake/console/libs/tasks/db_config.php
+++ b/cake/console/libs/tasks/db_config.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
diff --git a/cake/console/libs/tasks/extract.php b/cake/console/libs/tasks/extract.php
index 6bb5a27ff..b93f29320 100644
--- a/cake/console/libs/tasks/extract.php
+++ b/cake/console/libs/tasks/extract.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5012
diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index fac911605..13c321be8 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
diff --git a/cake/console/libs/tasks/plugin.php b/cake/console/libs/tasks/plugin.php
index 34bc1b4ed..4cf68d802 100644
--- a/cake/console/libs/tasks/plugin.php
+++ b/cake/console/libs/tasks/plugin.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php
index e2836daef..d6a3a547b 100644
--- a/cake/console/libs/tasks/project.php
+++ b/cake/console/libs/tasks/project.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.scripts.bake
  * @since         CakePHP(tm) v 1.2
diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php
index aa71bdb15..26d056a70 100644
--- a/cake/console/libs/tasks/test.php
+++ b/cake/console/libs/tasks/test.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php
index d15b5f243..14b8029be 100644
--- a/cake/console/libs/tasks/view.php
+++ b/cake/console/libs/tasks/view.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.tasks
  * @since         CakePHP(tm) v 1.2
diff --git a/cake/console/libs/templates/skel/app_controller.php b/cake/console/libs/templates/skel/app_controller.php
index 6c38cbe90..d88316a2b 100644
--- a/cake/console/libs/templates/skel/app_controller.php
+++ b/cake/console/libs/templates/skel/app_controller.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/console/libs/templates/skel/app_helper.php b/cake/console/libs/templates/skel/app_helper.php
index 3b751a8b4..b5c962f8f 100644
--- a/cake/console/libs/templates/skel/app_helper.php
+++ b/cake/console/libs/templates/skel/app_helper.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/console/libs/templates/skel/app_model.php b/cake/console/libs/templates/skel/app_model.php
index b1fcdc75a..bb6b950b5 100644
--- a/cake/console/libs/templates/skel/app_model.php
+++ b/cake/console/libs/templates/skel/app_model.php
@@ -9,15 +9,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/console/libs/templates/skel/config/acl.ini.php b/cake/console/libs/templates/skel/config/acl.ini.php
index 23ba4d25f..ad013f31f 100644
--- a/cake/console/libs/templates/skel/config/acl.ini.php
+++ b/cake/console/libs/templates/skel/config/acl.ini.php
@@ -7,14 +7,13 @@
 ; * PHP versions 4 and 5
 ; *
 ; * CakePHP(tm) :  Rapid Development Framework http://www.cakephp.org/
-; * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+; * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
 ; *
 ; *  Licensed under The MIT License
 ; *  Redistributions of files must retain the above copyright notice.
 ; *
-; * @filesource
-; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
-; * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+;; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+; * @link          http://cakephp.org CakePHP(tm) Project
 ; * @package       cake
 ; * @subpackage    cake.app.config
 ; * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/console/libs/templates/skel/config/bootstrap.php b/cake/console/libs/templates/skel/config/bootstrap.php
index bede17125..22bd4a938 100644
--- a/cake/console/libs/templates/skel/config/bootstrap.php
+++ b/cake/console/libs/templates/skel/config/bootstrap.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
  * @since         CakePHP(tm) v 0.10.8.2117
diff --git a/cake/console/libs/templates/skel/config/core.php b/cake/console/libs/templates/skel/config/core.php
index bbc34d0f8..a8bc5b9ee 100644
--- a/cake/console/libs/templates/skel/config/core.php
+++ b/cake/console/libs/templates/skel/config/core.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/console/libs/templates/skel/config/database.php.default b/cake/console/libs/templates/skel/config/database.php.default
index ac3e99dfe..c30e368ae 100644
--- a/cake/console/libs/templates/skel/config/database.php.default
+++ b/cake/console/libs/templates/skel/config/database.php.default
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/console/libs/templates/skel/config/inflections.php b/cake/console/libs/templates/skel/config/inflections.php
index 467b09c66..fe45e4d2f 100644
--- a/cake/console/libs/templates/skel/config/inflections.php
+++ b/cake/console/libs/templates/skel/config/inflections.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and %
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
  * @since         CakePHP(tm) v 1.0.0.2312
diff --git a/cake/console/libs/templates/skel/config/routes.php b/cake/console/libs/templates/skel/config/routes.php
index 1bec77b10..32094aa62 100644
--- a/cake/console/libs/templates/skel/config/routes.php
+++ b/cake/console/libs/templates/skel/config/routes.php
@@ -9,15 +9,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/console/libs/templates/skel/config/sql/db_acl.php b/cake/console/libs/templates/skel/config/sql/db_acl.php
index dd6a1ac1b..72530d65c 100644
--- a/cake/console/libs/templates/skel/config/sql/db_acl.php
+++ b/cake/console/libs/templates/skel/config/sql/db_acl.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config.sql
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/console/libs/templates/skel/config/sql/i18n.php b/cake/console/libs/templates/skel/config/sql/i18n.php
index 40c2957fe..ac0e7f5a9 100644
--- a/cake/console/libs/templates/skel/config/sql/i18n.php
+++ b/cake/console/libs/templates/skel/config/sql/i18n.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config.sql
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/console/libs/templates/skel/config/sql/sessions.php b/cake/console/libs/templates/skel/config/sql/sessions.php
index 334c0b9ce..8880e49b5 100644
--- a/cake/console/libs/templates/skel/config/sql/sessions.php
+++ b/cake/console/libs/templates/skel/config/sql/sessions.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.config.sql
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/console/libs/templates/skel/controllers/pages_controller.php b/cake/console/libs/templates/skel/controllers/pages_controller.php
index ecbb51388..4001408c0 100644
--- a/cake/console/libs/templates/skel/controllers/pages_controller.php
+++ b/cake/console/libs/templates/skel/controllers/pages_controller.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/console/libs/templates/skel/index.php b/cake/console/libs/templates/skel/index.php
index 057c1af3a..a8cca5d89 100644
--- a/cake/console/libs/templates/skel/index.php
+++ b/cake/console/libs/templates/skel/index.php
@@ -3,15 +3,14 @@
 /**
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/console/libs/templates/skel/views/elements/email/html/default.ctp b/cake/console/libs/templates/skel/views/elements/email/html/default.ctp
index 49a085a29..b7c906233 100644
--- a/cake/console/libs/templates/skel/views/elements/email/html/default.ctp
+++ b/cake/console/libs/templates/skel/views/elements/email/html/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/console/libs/templates/skel/views/elements/email/text/default.ctp b/cake/console/libs/templates/skel/views/elements/email/text/default.ctp
index 284acea16..d3f885b5c 100644
--- a/cake/console/libs/templates/skel/views/elements/email/text/default.ctp
+++ b/cake/console/libs/templates/skel/views/elements/email/text/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/console/libs/templates/skel/views/layouts/ajax.ctp b/cake/console/libs/templates/skel/views/layouts/ajax.ctp
index e6bd065e0..a3440dd2c 100644
--- a/cake/console/libs/templates/skel/views/layouts/ajax.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/ajax.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/console/libs/templates/skel/views/layouts/default.ctp b/cake/console/libs/templates/skel/views/layouts/default.ctp
index 589f4f447..f9b1423ab 100644
--- a/cake/console/libs/templates/skel/views/layouts/default.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.templates.skel.views.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp b/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
index 63573ac05..dbf7916be 100644
--- a/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp b/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
index 9a0cf7835..aeef64f2b 100644
--- a/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/console/libs/templates/skel/views/layouts/flash.ctp b/cake/console/libs/templates/skel/views/layouts/flash.ctp
index d02fa8571..9ec3209f4 100644
--- a/cake/console/libs/templates/skel/views/layouts/flash.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/flash.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/console/libs/templates/skel/webroot/css.php b/cake/console/libs/templates/skel/webroot/css.php
index e475508ee..b95cb8a36 100644
--- a/cake/console/libs/templates/skel/webroot/css.php
+++ b/cake/console/libs/templates/skel/webroot/css.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/console/libs/templates/skel/webroot/css/cake.generic.css b/cake/console/libs/templates/skel/webroot/css/cake.generic.css
index 29773b983..6769c99ca 100644
--- a/cake/console/libs/templates/skel/webroot/css/cake.generic.css
+++ b/cake/console/libs/templates/skel/webroot/css/cake.generic.css
@@ -3,15 +3,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot.css
  * @since         CakePHP(tm)
diff --git a/cake/console/libs/templates/skel/webroot/index.php b/cake/console/libs/templates/skel/webroot/index.php
index 1a4d7ddef..798b026f5 100644
--- a/cake/console/libs/templates/skel/webroot/index.php
+++ b/cake/console/libs/templates/skel/webroot/index.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/console/libs/templates/skel/webroot/js/vendors.php b/cake/console/libs/templates/skel/webroot/js/vendors.php
index 5c6181290..d9d38f690 100644
--- a/cake/console/libs/templates/skel/webroot/js/vendors.php
+++ b/cake/console/libs/templates/skel/webroot/js/vendors.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.app.webroot.js
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/console/libs/templates/skel/webroot/test.php b/cake/console/libs/templates/skel/webroot/test.php
index d0c4065a2..cb42147e7 100644
--- a/cake/console/libs/templates/skel/webroot/test.php
+++ b/cake/console/libs/templates/skel/webroot/test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/console/libs/templates/views/form.ctp b/cake/console/libs/templates/views/form.ctp
index 07fddcf0c..91c9f77db 100644
--- a/cake/console/libs/templates/views/form.ctp
+++ b/cake/console/libs/templates/views/form.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.templates.views
  * @since         CakePHP(tm) v 1.2.0.5234
diff --git a/cake/console/libs/templates/views/index.ctp b/cake/console/libs/templates/views/index.ctp
index fb089f9a3..13de4923b 100644
--- a/cake/console/libs/templates/views/index.ctp
+++ b/cake/console/libs/templates/views/index.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.templates.views
  * @since         CakePHP(tm) v 1.2.0.5234
diff --git a/cake/console/libs/templates/views/view.ctp b/cake/console/libs/templates/views/view.ctp
index 1a9c73d2c..362d57c89 100644
--- a/cake/console/libs/templates/views/view.ctp
+++ b/cake/console/libs/templates/views/view.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.templates.views
  * @since         CakePHP(tm) v 1.2.0.5234
diff --git a/cake/console/libs/testsuite.php b/cake/console/libs/testsuite.php
index 03408ba8b..6e8df608b 100644
--- a/cake/console/libs/testsuite.php
+++ b/cake/console/libs/testsuite.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.console.libs
diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index 7c241473c..69eb962f5 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -9,14 +9,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 1162e61e6..bc93aa9a2 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -6,15 +6,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0.4933
diff --git a/cake/libs/cache/apc.php b/cake/libs/cache/apc.php
index dcba88221..ecf8f746c 100644
--- a/cake/libs/cache/apc.php
+++ b/cake/libs/cache/apc.php
@@ -6,15 +6,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.cache
  * @since         CakePHP(tm) v 1.2.0.4933
diff --git a/cake/libs/cache/file.php b/cake/libs/cache/file.php
index ab17230dc..c98ccc6d3 100644
--- a/cake/libs/cache/file.php
+++ b/cake/libs/cache/file.php
@@ -6,15 +6,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.cache
  * @since         CakePHP(tm) v 1.2.0.4933
diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php
index 0ee73f4a5..fb293176d 100644
--- a/cake/libs/cache/memcache.php
+++ b/cake/libs/cache/memcache.php
@@ -6,15 +6,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.cache
  * @since         CakePHP(tm) v 1.2.0.4933
diff --git a/cake/libs/cache/xcache.php b/cake/libs/cache/xcache.php
index 211e46ddb..f25dbdd2c 100644
--- a/cake/libs/cache/xcache.php
+++ b/cake/libs/cache/xcache.php
@@ -6,15 +6,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.cache
  * @since         CakePHP(tm) v 1.2.0.4947
diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php
index 852f8fcb5..b0b6404b3 100644
--- a/cake/libs/cake_log.php
+++ b/cake/libs/cake_log.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/class_registry.php b/cake/libs/class_registry.php
index 07b3a0599..a825e800e 100644
--- a/cake/libs/class_registry.php
+++ b/cake/libs/class_registry.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 0.9.2
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index b9c2914de..4d0ed0a2f 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.0.0.2363
diff --git a/cake/libs/controller/app_controller.php b/cake/libs/controller/app_controller.php
index d15e034d1..57d35bada 100644
--- a/cake/libs/controller/app_controller.php
+++ b/cake/libs/controller/app_controller.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php
index 27dab4efe..3e740003c 100644
--- a/cake/libs/controller/component.php
+++ b/cake/libs/controller/component.php
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller
  * @since         CakePHP(tm) v TBD
diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php
index 5caceceaa..2d53b3283 100644
--- a/cake/libs/controller/components/acl.php
+++ b/cake/libs/controller/components/acl.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
index 574481a7a..ec1a03051 100644
--- a/cake/libs/controller/components/auth.php
+++ b/cake/libs/controller/components/auth.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php
index deaa2647a..04ac59918 100644
--- a/cake/libs/controller/components/cookie.php
+++ b/cake/libs/controller/components/cookie.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
  * @since         CakePHP(tm) v 1.2.0.4213
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index 6fa466cd7..61f6e2ed1 100644
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
  * @since         CakePHP(tm) v 1.2.0.3467
diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php
index e95b6bd79..25342941b 100644
--- a/cake/libs/controller/components/request_handler.php
+++ b/cake/libs/controller/components/request_handler.php
@@ -7,15 +7,14 @@
  * and the like.  These units have no use for Ajax requests, and this Component can tell how Cake
  * should respond to the different needs of a handheld computer and a desktop machine.
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
  * @since         CakePHP(tm) v 0.10.4.1076
diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index 5aca459b6..306080d41 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -8,14 +8,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
  * @since         CakePHP(tm) v 0.10.8.2156
diff --git a/cake/libs/controller/components/session.php b/cake/libs/controller/components/session.php
index 08b61cbca..483ddba31 100644
--- a/cake/libs/controller/components/session.php
+++ b/cake/libs/controller/components/session.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller.components
  * @since         CakePHP(tm) v 0.10.0.1232
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 721a45c4e..2f12be5d2 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/controller/pages_controller.php b/cake/libs/controller/pages_controller.php
index ecbb51388..4001408c0 100644
--- a/cake/libs/controller/pages_controller.php
+++ b/cake/libs/controller/pages_controller.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php
index b2e1d93af..d885e8a2e 100644
--- a/cake/libs/controller/scaffold.php
+++ b/cake/libs/controller/scaffold.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.controller
  * @since         Cake v 0.10.0.1076
diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php
index 4afa34b01..a4cd47a7b 100644
--- a/cake/libs/debugger.php
+++ b/cake/libs/debugger.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.4560
diff --git a/cake/libs/error.php b/cake/libs/error.php
index 195dbf7d1..e3c0a3d14 100644
--- a/cake/libs/error.php
+++ b/cake/libs/error.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 0.10.5.1732
diff --git a/cake/libs/file.php b/cake/libs/file.php
index 641f2e1e5..fba1f3aa3 100644
--- a/cake/libs/file.php
+++ b/cake/libs/file.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/flay.php b/cake/libs/flay.php
index ec3c213b3..1a81930af 100644
--- a/cake/libs/flay.php
+++ b/cake/libs/flay.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/folder.php b/cake/libs/folder.php
index 5f6154c96..bd0ef42cf 100644
--- a/cake/libs/folder.php
+++ b/cake/libs/folder.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index 44e4dfc2b..ccd5aa037 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0
diff --git a/cake/libs/i18n.php b/cake/libs/i18n.php
index 6eba0bae9..8fdb30b15 100644
--- a/cake/libs/i18n.php
+++ b/cake/libs/i18n.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0.4116
diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index 2a94a84e1..9ce5714d4 100644
--- a/cake/libs/inflector.php
+++ b/cake/libs/inflector.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php
index 85f978a7d..13a2e9a6b 100644
--- a/cake/libs/l10n.php
+++ b/cake/libs/l10n.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0.4116
diff --git a/cake/libs/magic_db.php b/cake/libs/magic_db.php
index 37396618c..a5784441a 100644
--- a/cake/libs/magic_db.php
+++ b/cake/libs/magic_db.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0
diff --git a/cake/libs/model/app_model.php b/cake/libs/model/app_model.php
index a311329c8..e09b1f970 100644
--- a/cake/libs/model/app_model.php
+++ b/cake/libs/model/app_model.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/model/behavior.php b/cake/libs/model/behavior.php
index 61d319485..d91bf0eb3 100644
--- a/cake/libs/model/behavior.php
+++ b/cake/libs/model/behavior.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model
  * @since         CakePHP(tm) v 1.2.0.0
diff --git a/cake/libs/model/behaviors/acl.php b/cake/libs/model/behaviors/acl.php
index 01de82dca..e2c7038c0 100644
--- a/cake/libs/model/behaviors/acl.php
+++ b/cake/libs/model/behaviors/acl.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.behaviors
  * @since         CakePHP v 1.2.0.4487
diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php
index 52f519ac4..221cb8f1e 100644
--- a/cake/libs/model/behaviors/containable.php
+++ b/cake/libs/model/behaviors/containable.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs
  * @since         CakePHP(tm) v 1.2.0.5669
diff --git a/cake/libs/model/behaviors/translate.php b/cake/libs/model/behaviors/translate.php
index 1162180ab..bba76be4d 100644
--- a/cake/libs/model/behaviors/translate.php
+++ b/cake/libs/model/behaviors/translate.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.behaviors
  * @since         CakePHP(tm) v 1.2.0.4525
diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php
index addd8c6c2..ab1d2ff9c 100644
--- a/cake/libs/model/behaviors/tree.php
+++ b/cake/libs/model/behaviors/tree.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.behaviors
  * @since         CakePHP v 1.2.0.4487
diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php
index 867605f50..581cd3b2d 100644
--- a/cake/libs/model/connection_manager.php
+++ b/cake/libs/model/connection_manager.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model
  * @since         CakePHP(tm) v 0.10.x.1402
diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php
index 835ba3a1d..e57fbfcd6 100644
--- a/cake/libs/model/datasources/datasource.php
+++ b/cake/libs/model/datasources/datasource.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources
  * @since         CakePHP(tm) v 0.10.5.1790
diff --git a/cake/libs/model/datasources/dbo/dbo_adodb.php b/cake/libs/model/datasources/dbo/dbo_adodb.php
index 94badf16b..e089e1f10 100644
--- a/cake/libs/model/datasources/dbo/dbo_adodb.php
+++ b/cake/libs/model/datasources/dbo/dbo_adodb.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/model/datasources/dbo/dbo_db2.php b/cake/libs/model/datasources/dbo/dbo_db2.php
index 100b28535..0a5600bca 100644
--- a/cake/libs/model/datasources/dbo/dbo_db2.php
+++ b/cake/libs/model/datasources/dbo/dbo_db2.php
@@ -9,15 +9,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
  * Copyright 2007, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
  * @since         CakePHP(tm) v 0.10.5.1790
diff --git a/cake/libs/model/datasources/dbo/dbo_firebird.php b/cake/libs/model/datasources/dbo/dbo_firebird.php
index f1c29e5b9..06454fef6 100644
--- a/cake/libs/model/datasources/dbo/dbo_firebird.php
+++ b/cake/libs/model/datasources/dbo/dbo_firebird.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.dbo
  * @since         CakePHP(tm) v 1.2.0.5152
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index 18c138364..dadf67660 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
  * @since         CakePHP(tm) v 0.10.5.1790
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index 94962a8b7..190d96aa1 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
  * @since         CakePHP(tm) v 0.10.5.1790
diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index cc506e5a2..d7e991476 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
  * @since         CakePHP(tm) v 1.1.4.2974
diff --git a/cake/libs/model/datasources/dbo/dbo_odbc.php b/cake/libs/model/datasources/dbo/dbo_odbc.php
index 64ab17d51..d35f5e7a8 100644
--- a/cake/libs/model/datasources/dbo/dbo_odbc.php
+++ b/cake/libs/model/datasources/dbo/dbo_odbc.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.dbo
  * @since         CakePHP(tm) v 0.10.5.1790
diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
index f74c18766..db6a1586c 100644
--- a/cake/libs/model/datasources/dbo/dbo_oracle.php
+++ b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
  * @since         CakePHP v 1.2.0.4041
diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index e2c0d8ce3..959a23826 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
  * @since         CakePHP(tm) v 0.9.1.114
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index dea7385bc..3b13e7980 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
  * @since         CakePHP(tm) v 0.9.0
diff --git a/cake/libs/model/datasources/dbo/dbo_sybase.php b/cake/libs/model/datasources/dbo/dbo_sybase.php
index 5e30bfe3b..21c87b62b 100644
--- a/cake/libs/model/datasources/dbo/dbo_sybase.php
+++ b/cake/libs/model/datasources/dbo/dbo_sybase.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
  * @since         CakePHP(tm) v 1.2.0.3097
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 95929a56c..94c060cc7 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/model/db_acl.php b/cake/libs/model/db_acl.php
index aae5f718d..49b3d04fb 100644
--- a/cake/libs/model/db_acl.php
+++ b/cake/libs/model/db_acl.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 78be07d47..158ee86ea 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model
  * @since         CakePHP(tm) v 0.10.0.0
diff --git a/cake/libs/model/schema.php b/cake/libs/model/schema.php
index 5de4a5e84..7457968af 100644
--- a/cake/libs/model/schema.php
+++ b/cake/libs/model/schema.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model
  * @since         CakePHP(tm) v 1.2.0.5550
diff --git a/cake/libs/multibyte.php b/cake/libs/multibyte.php
index d9ac214a0..069136ccc 100644
--- a/cake/libs/multibyte.php
+++ b/cake/libs/multibyte.php
@@ -6,15 +6,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0.6833
diff --git a/cake/libs/object.php b/cake/libs/object.php
index eda5d7f63..0b83127e6 100644
--- a/cake/libs/object.php
+++ b/cake/libs/object.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/overloadable.php b/cake/libs/overloadable.php
index c58a4986b..2714ae81c 100644
--- a/cake/libs/overloadable.php
+++ b/cake/libs/overloadable.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2
diff --git a/cake/libs/overloadable_php4.php b/cake/libs/overloadable_php4.php
index 1e0750a17..e4977bc16 100644
--- a/cake/libs/overloadable_php4.php
+++ b/cake/libs/overloadable_php4.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2
diff --git a/cake/libs/overloadable_php5.php b/cake/libs/overloadable_php5.php
index d78a8ab91..27aadff1a 100644
--- a/cake/libs/overloadable_php5.php
+++ b/cake/libs/overloadable_php5.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2
diff --git a/cake/libs/router.php b/cake/libs/router.php
index dc22a29ef..c3fca15ce 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/sanitize.php b/cake/libs/sanitize.php
index 90ab45325..45a8b5689 100644
--- a/cake/libs/sanitize.php
+++ b/cake/libs/sanitize.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/security.php b/cake/libs/security.php
index 72b453a03..4dba07c55 100644
--- a/cake/libs/security.php
+++ b/cake/libs/security.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v .0.10.0.1233
diff --git a/cake/libs/session.php b/cake/libs/session.php
index cc4d41524..b3ba09e7a 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -10,15 +10,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v .0.10.0.1222
diff --git a/cake/libs/set.php b/cake/libs/set.php
index 8a83d3c7f..f6b13a9b4 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0
diff --git a/cake/libs/socket.php b/cake/libs/socket.php
index 9308b0a2c..1ec8bf4b3 100644
--- a/cake/libs/socket.php
+++ b/cake/libs/socket.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0
diff --git a/cake/libs/string.php b/cake/libs/string.php
index 279e84732..9717896ae 100644
--- a/cake/libs/string.php
+++ b/cake/libs/string.php
@@ -6,15 +6,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0.5551
diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index 93adc1439..fbe6bdf46 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0.3830
diff --git a/cake/libs/view/elements/dump.ctp b/cake/libs/view/elements/dump.ctp
index 9b1f807a3..622a531d0 100644
--- a/cake/libs/view/elements/dump.ctp
+++ b/cake/libs/view/elements/dump.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements
  * @since         CakePHP(tm) v 0.10.5.1782
diff --git a/cake/libs/view/elements/email/html/default.ctp b/cake/libs/view/elements/email/html/default.ctp
index 49a085a29..b7c906233 100644
--- a/cake/libs/view/elements/email/html/default.ctp
+++ b/cake/libs/view/elements/email/html/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/elements/email/text/default.ctp b/cake/libs/view/elements/email/text/default.ctp
index 284acea16..d3f885b5c 100644
--- a/cake/libs/view/elements/email/text/default.ctp
+++ b/cake/libs/view/elements/email/text/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/error404.ctp b/cake/libs/view/errors/error404.ctp
index aa6dcd9ab..b1bc0686d 100644
--- a/cake/libs/view/errors/error404.ctp
+++ b/cake/libs/view/errors/error404.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/missing_action.ctp b/cake/libs/view/errors/missing_action.ctp
index 00b65e886..1e9cc196d 100644
--- a/cake/libs/view/errors/missing_action.ctp
+++ b/cake/libs/view/errors/missing_action.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/missing_component_class.ctp b/cake/libs/view/errors/missing_component_class.ctp
index 7171c32c9..ce8ff52bb 100644
--- a/cake/libs/view/errors/missing_component_class.ctp
+++ b/cake/libs/view/errors/missing_component_class.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/missing_component_file.ctp b/cake/libs/view/errors/missing_component_file.ctp
index fa44f497e..83520da99 100644
--- a/cake/libs/view/errors/missing_component_file.ctp
+++ b/cake/libs/view/errors/missing_component_file.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/missing_connection.ctp b/cake/libs/view/errors/missing_connection.ctp
index 66fd3500e..754c2a3d5 100644
--- a/cake/libs/view/errors/missing_connection.ctp
+++ b/cake/libs/view/errors/missing_connection.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/missing_controller.ctp b/cake/libs/view/errors/missing_controller.ctp
index acad3e50a..f50b8d6e8 100644
--- a/cake/libs/view/errors/missing_controller.ctp
+++ b/cake/libs/view/errors/missing_controller.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/missing_helper_class.ctp b/cake/libs/view/errors/missing_helper_class.ctp
index 9718ae33c..ac7877682 100644
--- a/cake/libs/view/errors/missing_helper_class.ctp
+++ b/cake/libs/view/errors/missing_helper_class.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/missing_helper_file.ctp b/cake/libs/view/errors/missing_helper_file.ctp
index 5c33ca213..d5a72f9b8 100644
--- a/cake/libs/view/errors/missing_helper_file.ctp
+++ b/cake/libs/view/errors/missing_helper_file.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/missing_layout.ctp b/cake/libs/view/errors/missing_layout.ctp
index c86a48d8b..febe11d33 100644
--- a/cake/libs/view/errors/missing_layout.ctp
+++ b/cake/libs/view/errors/missing_layout.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/missing_model.ctp b/cake/libs/view/errors/missing_model.ctp
index bcd421fb8..e7e45c484 100644
--- a/cake/libs/view/errors/missing_model.ctp
+++ b/cake/libs/view/errors/missing_model.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/missing_scaffolddb.ctp b/cake/libs/view/errors/missing_scaffolddb.ctp
index f694fbc7b..f6355a850 100644
--- a/cake/libs/view/errors/missing_scaffolddb.ctp
+++ b/cake/libs/view/errors/missing_scaffolddb.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/missing_table.ctp b/cake/libs/view/errors/missing_table.ctp
index e8be76f3d..a1775a4e5 100644
--- a/cake/libs/view/errors/missing_table.ctp
+++ b/cake/libs/view/errors/missing_table.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/missing_view.ctp b/cake/libs/view/errors/missing_view.ctp
index aefdae41b..503179f96 100644
--- a/cake/libs/view/errors/missing_view.ctp
+++ b/cake/libs/view/errors/missing_view.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/private_action.ctp b/cake/libs/view/errors/private_action.ctp
index 35d630529..23beb5052 100644
--- a/cake/libs/view/errors/private_action.ctp
+++ b/cake/libs/view/errors/private_action.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/errors/scaffold_error.ctp b/cake/libs/view/errors/scaffold_error.ctp
index 09dc0eb52..48b8db4db 100644
--- a/cake/libs/view/errors/scaffold_error.ctp
+++ b/cake/libs/view/errors/scaffold_error.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.errors
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
index d4a873f76..2cd51639c 100644
--- a/cake/libs/view/helper.php
+++ b/cake/libs/view/helper.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php
index c2bbb5ba0..600c93327 100644
--- a/cake/libs/view/helpers/ajax.php
+++ b/cake/libs/view/helpers/ajax.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/helpers/app_helper.php b/cake/libs/view/helpers/app_helper.php
index 3b751a8b4..b5c962f8f 100644
--- a/cake/libs/view/helpers/app_helper.php
+++ b/cake/libs/view/helpers/app_helper.php
@@ -8,15 +8,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php
index 58757c77e..f3043ba2a 100644
--- a/cake/libs/view/helpers/cache.php
+++ b/cake/libs/view/helpers/cache.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
  * @since         CakePHP(tm) v 1.0.0.2277
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index a1aaa34fc..fc90a5a6c 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index 044a511a7..446188650 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -5,15 +5,14 @@
  *
  * Simplifies the construction of HTML elements.
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
  * @since         CakePHP(tm) v 0.9.1
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index f07a6cedc..aacfd4e0e 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
index c8f46a439..8cc82c9fa 100644
--- a/cake/libs/view/helpers/js.php
+++ b/cake/libs/view/helpers/js.php
@@ -11,9 +11,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
  * @since         CakePHP v 1.2
diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php
index 5e240d679..69b7e1130 100644
--- a/cake/libs/view/helpers/number.php
+++ b/cake/libs/view/helpers/number.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 054ae44ec..d00477853 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -5,15 +5,14 @@
  *
  * Generates pagination links
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
  * @since         CakePHP(tm) v 1.2.0
diff --git a/cake/libs/view/helpers/rss.php b/cake/libs/view/helpers/rss.php
index 6de685ebb..5ab558308 100644
--- a/cake/libs/view/helpers/rss.php
+++ b/cake/libs/view/helpers/rss.php
@@ -5,15 +5,14 @@
  *
  * Simplifies the output of RSS feeds.
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
  * @since         CakePHP(tm) v 1.2
diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php
index e69658e84..d8303fb7b 100644
--- a/cake/libs/view/helpers/session.php
+++ b/cake/libs/view/helpers/session.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
  * @since         CakePHP(tm) v 1.1.7.3328
diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php
index 737681ef9..546b0e632 100644
--- a/cake/libs/view/helpers/text.php
+++ b/cake/libs/view/helpers/text.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php
index e9d0feca9..637514cb2 100644
--- a/cake/libs/view/helpers/time.php
+++ b/cake/libs/view/helpers/time.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/helpers/xml.php b/cake/libs/view/helpers/xml.php
index ab6810eb7..aeec5ab36 100644
--- a/cake/libs/view/helpers/xml.php
+++ b/cake/libs/view/helpers/xml.php
@@ -5,15 +5,14 @@
  *
  * Simplifies the output of XML documents.
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
  * @since         CakePHP(tm) v 1.2
diff --git a/cake/libs/view/layouts/ajax.ctp b/cake/libs/view/layouts/ajax.ctp
index e6bd065e0..a3440dd2c 100644
--- a/cake/libs/view/layouts/ajax.ctp
+++ b/cake/libs/view/layouts/ajax.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/layouts/default.ctp b/cake/libs/view/layouts/default.ctp
index 9be4e143d..79efc313a 100644
--- a/cake/libs/view/layouts/default.ctp
+++ b/cake/libs/view/layouts/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/layouts/email/html/default.ctp b/cake/libs/view/layouts/email/html/default.ctp
index 1467a8847..fdac9bd00 100644
--- a/cake/libs/view/layouts/email/html/default.ctp
+++ b/cake/libs/view/layouts/email/html/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/layouts/email/text/default.ctp b/cake/libs/view/layouts/email/text/default.ctp
index 502a393fc..8131e4710 100644
--- a/cake/libs/view/layouts/email/text/default.ctp
+++ b/cake/libs/view/layouts/email/text/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/layouts/flash.ctp b/cake/libs/view/layouts/flash.ctp
index 44b388f28..c48aaf62e 100644
--- a/cake/libs/view/layouts/flash.ctp
+++ b/cake/libs/view/layouts/flash.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/media.php b/cake/libs/view/media.php
index 1738036fd..2ec12d66b 100644
--- a/cake/libs/view/media.php
+++ b/cake/libs/view/media.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view
  * @since         CakePHP(tm) v 1.2.0.5714
diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp
index 61c427c60..d63519b95 100644
--- a/cake/libs/view/pages/home.ctp
+++ b/cake/libs/view/pages/home.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.pages
  * @since         CakePHP(tm) v 0.10.0.1076
@@ -120,7 +119,7 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
 </p>
 <br />
 <ul>
-	<li><a href="http://www.cakefoundation.org/"><?php __('Cake Software Foundation'); ?> </a>
+	<li><a href="http://cakefoundation.org/"><?php __('Cake Software Foundation'); ?> </a>
 	<ul><li><?php __('Promoting development related to CakePHP'); ?></li></ul></li>
 	<li><a href="http://www.cakephp.org"><?php __('CakePHP'); ?> </a>
 	<ul><li><?php __('The Rapid Development Framework'); ?></li></ul></li>
diff --git a/cake/libs/view/scaffolds/edit.ctp b/cake/libs/view/scaffolds/edit.ctp
index 36b4e845e..215a77aed 100644
--- a/cake/libs/view/scaffolds/edit.ctp
+++ b/cake/libs/view/scaffolds/edit.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.scaffolds
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/scaffolds/index.ctp b/cake/libs/view/scaffolds/index.ctp
index c67553b46..79039c02d 100644
--- a/cake/libs/view/scaffolds/index.ctp
+++ b/cake/libs/view/scaffolds/index.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.console.libs.templates.views
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/scaffolds/view.ctp b/cake/libs/view/scaffolds/view.ctp
index 5b3572c0e..11ff93796 100644
--- a/cake/libs/view/scaffolds/view.ctp
+++ b/cake/libs/view/scaffolds/view.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.scaffolds
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/theme.php b/cake/libs/view/theme.php
index 594cdb117..0c318e643 100644
--- a/cake/libs/view/theme.php
+++ b/cake/libs/view/theme.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 44f9437fe..ca2319a0b 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index ad8cf15e0..81acb6921 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP v .0.10.3.1400
diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php
index 8920c0bc3..03164730b 100644
--- a/cake/tests/cases/basics.test.php
+++ b/cake/tests/cases/basics.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases
diff --git a/cake/tests/cases/console/cake.test.php b/cake/tests/cases/console/cake.test.php
index 949fede8a..de04d74ef 100644
--- a/cake/tests/cases/console/cake.test.php
+++ b/cake/tests/cases/console/cake.test.php
@@ -13,7 +13,6 @@
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc.
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
diff --git a/cake/tests/cases/console/libs/acl.test.php b/cake/tests/cases/console/libs/acl.test.php
index 55dff3402..145d7b70e 100644
--- a/cake/tests/cases/console/libs/acl.test.php
+++ b/cake/tests/cases/console/libs/acl.test.php
@@ -11,9 +11,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs.tasks
  * @since         CakePHP v 1.2.0.7726
diff --git a/cake/tests/cases/console/libs/api.test.php b/cake/tests/cases/console/libs/api.test.php
index 1d089b179..29f84eafe 100644
--- a/cake/tests/cases/console/libs/api.test.php
+++ b/cake/tests/cases/console/libs/api.test.php
@@ -11,9 +11,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs.tasks
  * @since         CakePHP v 1.2.0.7726
diff --git a/cake/tests/cases/console/libs/schema.test.php b/cake/tests/cases/console/libs/schema.test.php
index e4cf0a856..57c850590 100644
--- a/cake/tests/cases/console/libs/schema.test.php
+++ b/cake/tests/cases/console/libs/schema.test.php
@@ -10,9 +10,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs.Shells
  * @since         CakePHP v 1.3
diff --git a/cake/tests/cases/console/libs/shell.test.php b/cake/tests/cases/console/libs/shell.test.php
index ec50f577b..5117da879 100644
--- a/cake/tests/cases/console/libs/shell.test.php
+++ b/cake/tests/cases/console/libs/shell.test.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs
  * @since         CakePHP v 1.2.0.7726
diff --git a/cake/tests/cases/console/libs/tasks/extract.test.php b/cake/tests/cases/console/libs/tasks/extract.test.php
index 37e79dc27..51c50d89b 100644
--- a/cake/tests/cases/console/libs/tasks/extract.test.php
+++ b/cake/tests/cases/console/libs/tasks/extract.test.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs.tasks
  * @since         CakePHP v 1.2.0.7726
diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php
index f61262f21..e47d35bf0 100644
--- a/cake/tests/cases/console/libs/tasks/model.test.php
+++ b/cake/tests/cases/console/libs/tasks/model.test.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs.tasks
  * @since         CakePHP v 1.2.6
diff --git a/cake/tests/cases/console/libs/tasks/test.test.php b/cake/tests/cases/console/libs/tasks/test.test.php
index b646dc554..a07f26989 100644
--- a/cake/tests/cases/console/libs/tasks/test.test.php
+++ b/cake/tests/cases/console/libs/tasks/test.test.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs.tasks
  * @since         CakePHP v 1.2.0.7726
diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php
index 98f6312fb..0ff46bb3b 100644
--- a/cake/tests/cases/dispatcher.test.php
+++ b/cake/tests/cases/dispatcher.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases
diff --git a/cake/tests/cases/libs/cache.test.php b/cake/tests/cases/libs/cache.test.php
index 82ed7762f..6909e5047 100644
--- a/cake/tests/cases/libs/cache.test.php
+++ b/cake/tests/cases/libs/cache.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/cache/apc.test.php b/cake/tests/cases/libs/cache/apc.test.php
index 2f75cf9e2..8a9229bf2 100644
--- a/cake/tests/cases/libs/cache/apc.test.php
+++ b/cake/tests/cases/libs/cache/apc.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.cache
diff --git a/cake/tests/cases/libs/cache/file.test.php b/cake/tests/cases/libs/cache/file.test.php
index 4bc0ab3d0..76c0d11bc 100644
--- a/cake/tests/cases/libs/cache/file.test.php
+++ b/cake/tests/cases/libs/cache/file.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.cache
diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/cake/tests/cases/libs/cache/memcache.test.php
index aa56459ec..0a62804fb 100644
--- a/cake/tests/cases/libs/cache/memcache.test.php
+++ b/cake/tests/cases/libs/cache/memcache.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.cache
diff --git a/cake/tests/cases/libs/cache/xcache.test.php b/cake/tests/cases/libs/cache/xcache.test.php
index 818d10ada..3a5392d20 100644
--- a/cake/tests/cases/libs/cache/xcache.test.php
+++ b/cake/tests/cases/libs/cache/xcache.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.cache
diff --git a/cake/tests/cases/libs/cake_log.test.php b/cake/tests/cases/libs/cake_log.test.php
index 8ab46ca9a..095682ad1 100644
--- a/cake/tests/cases/libs/cake_log.test.php
+++ b/cake/tests/cases/libs/cake_log.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/cake_test_case.test.php b/cake/tests/cases/libs/cake_test_case.test.php
index 5340f8f5d..7b0a486b8 100644
--- a/cake/tests/cases/libs/cake_test_case.test.php
+++ b/cake/tests/cases/libs/cake_test_case.test.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.
  * @since         CakePHP v 1.2.0.4487
diff --git a/cake/tests/cases/libs/cake_test_fixture.test.php b/cake/tests/cases/libs/cake_test_fixture.test.php
index b2e438abb..9e46b4083 100644
--- a/cake/tests/cases/libs/cake_test_fixture.test.php
+++ b/cake/tests/cases/libs/cake_test_fixture.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/cases/libs/class_registry.test.php b/cake/tests/cases/libs/class_registry.test.php
index e8dd6886d..06b3698a2 100644
--- a/cake/tests/cases/libs/class_registry.test.php
+++ b/cake/tests/cases/libs/class_registry.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/code_coverage_manager.test.php b/cake/tests/cases/libs/code_coverage_manager.test.php
index af1ae0b73..d6bbd2e66 100644
--- a/cake/tests/cases/libs/code_coverage_manager.test.php
+++ b/cake/tests/cases/libs/code_coverage_manager.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
index af0f26402..6339ce735 100644
--- a/cake/tests/cases/libs/configure.test.php
+++ b/cake/tests/cases/libs/configure.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/controller/component.test.php b/cake/tests/cases/libs/controller/component.test.php
index cf1386cd7..b3cd367f9 100644
--- a/cake/tests/cases/libs/controller/component.test.php
+++ b/cake/tests/cases/libs/controller/component.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller
diff --git a/cake/tests/cases/libs/controller/components/acl.test.php b/cake/tests/cases/libs/controller/components/acl.test.php
index 2daff3f67..1c23bfa67 100644
--- a/cake/tests/cases/libs/controller/components/acl.test.php
+++ b/cake/tests/cases/libs/controller/components/acl.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller.components
diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php
index 4890f70d3..0de2c1e20 100644
--- a/cake/tests/cases/libs/controller/components/auth.test.php
+++ b/cake/tests/cases/libs/controller/components/auth.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.cases.libs.controller.components
diff --git a/cake/tests/cases/libs/controller/components/cookie.test.php b/cake/tests/cases/libs/controller/components/cookie.test.php
index c5ebef42b..de122d107 100644
--- a/cake/tests/cases/libs/controller/components/cookie.test.php
+++ b/cake/tests/cases/libs/controller/components/cookie.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller.components
diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php
index 32c97be30..036faaf11 100644
--- a/cake/tests/cases/libs/controller/components/email.test.php
+++ b/cake/tests/cases/libs/controller/components/email.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.cases.libs.controller.components
diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php
index 24ce58218..b9cc6e762 100644
--- a/cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/cake/tests/cases/libs/controller/components/request_handler.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller.components
diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php
index b1cf605f6..e32109ea6 100644
--- a/cake/tests/cases/libs/controller/components/security.test.php
+++ b/cake/tests/cases/libs/controller/components/security.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller.components
diff --git a/cake/tests/cases/libs/controller/components/session.test.php b/cake/tests/cases/libs/controller/components/session.test.php
index 4b6dd69ba..c87c9f6f0 100644
--- a/cake/tests/cases/libs/controller/components/session.test.php
+++ b/cake/tests/cases/libs/controller/components/session.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller.components
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index a522bc252..1b06f487a 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller
diff --git a/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
index b0a5a3733..306ec187d 100644
--- a/cake/tests/cases/libs/controller/controller_merge_vars.test.php
+++ b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller
diff --git a/cake/tests/cases/libs/controller/pages_controller.test.php b/cake/tests/cases/libs/controller/pages_controller.test.php
index 50fdd5177..df16eeb08 100644
--- a/cake/tests/cases/libs/controller/pages_controller.test.php
+++ b/cake/tests/cases/libs/controller/pages_controller.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller
diff --git a/cake/tests/cases/libs/controller/scaffold.test.php b/cake/tests/cases/libs/controller/scaffold.test.php
index 729523253..aff5f5aa5 100644
--- a/cake/tests/cases/libs/controller/scaffold.test.php
+++ b/cake/tests/cases/libs/controller/scaffold.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller
diff --git a/cake/tests/cases/libs/debugger.test.php b/cake/tests/cases/libs/debugger.test.php
index 0dd77a6b6..09ed07535 100644
--- a/cake/tests/cases/libs/debugger.test.php
+++ b/cake/tests/cases/libs/debugger.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/error.test.php b/cake/tests/cases/libs/error.test.php
index 2a13f5e56..161e65639 100644
--- a/cake/tests/cases/libs/error.test.php
+++ b/cake/tests/cases/libs/error.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/file.test.php b/cake/tests/cases/libs/file.test.php
index 2a395d0ac..8133c58fc 100644
--- a/cake/tests/cases/libs/file.test.php
+++ b/cake/tests/cases/libs/file.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/flay.test.php b/cake/tests/cases/libs/flay.test.php
index c064ff5e3..ff413320e 100644
--- a/cake/tests/cases/libs/flay.test.php
+++ b/cake/tests/cases/libs/flay.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/folder.test.php b/cake/tests/cases/libs/folder.test.php
index eaf1de3d1..ecdf13e99 100644
--- a/cake/tests/cases/libs/folder.test.php
+++ b/cake/tests/cases/libs/folder.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php
index 49e3ed58e..0fa79d453 100644
--- a/cake/tests/cases/libs/http_socket.test.php
+++ b/cake/tests/cases/libs/http_socket.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/i18n.test.php b/cake/tests/cases/libs/i18n.test.php
index 3d395d26e..7a6366615 100644
--- a/cake/tests/cases/libs/i18n.test.php
+++ b/cake/tests/cases/libs/i18n.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php
index d99bdcb2b..b896805a3 100644
--- a/cake/tests/cases/libs/inflector.test.php
+++ b/cake/tests/cases/libs/inflector.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php
index a11d1e031..a8f8d5030 100644
--- a/cake/tests/cases/libs/l10n.test.php
+++ b/cake/tests/cases/libs/l10n.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/magic_db.test.php b/cake/tests/cases/libs/magic_db.test.php
index 1be3c30cb..1ef07f6b9 100644
--- a/cake/tests/cases/libs/magic_db.test.php
+++ b/cake/tests/cases/libs/magic_db.test.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0
diff --git a/cake/tests/cases/libs/model/behavior.test.php b/cake/tests/cases/libs/model/behavior.test.php
index 49b53cd2a..93516ab86 100644
--- a/cake/tests/cases/libs/model/behavior.test.php
+++ b/cake/tests/cases/libs/model/behavior.test.php
@@ -12,7 +12,6 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
  * @link          http://www.cakephp.org
  * @package       cake
diff --git a/cake/tests/cases/libs/model/behaviors/acl.test.php b/cake/tests/cases/libs/model/behaviors/acl.test.php
index 102d75884..c43d52c25 100644
--- a/cake/tests/cases/libs/model/behaviors/acl.test.php
+++ b/cake/tests/cases/libs/model/behaviors/acl.test.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.tests.model.behaviors.acl
  * @since         CakePHP v 1.2.0.4487
diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index e491611c6..ebfa57a54 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model.behaviors
diff --git a/cake/tests/cases/libs/model/behaviors/translate.test.php b/cake/tests/cases/libs/model/behaviors/translate.test.php
index 1231eecb9..426da7817 100644
--- a/cake/tests/cases/libs/model/behaviors/translate.test.php
+++ b/cake/tests/cases/libs/model/behaviors/translate.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model.behaviors
diff --git a/cake/tests/cases/libs/model/behaviors/tree.test.php b/cake/tests/cases/libs/model/behaviors/tree.test.php
index 8f58ac003..768b5b48a 100644
--- a/cake/tests/cases/libs/model/behaviors/tree.test.php
+++ b/cake/tests/cases/libs/model/behaviors/tree.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model.behaviors
diff --git a/cake/tests/cases/libs/model/connection_manager.test.php b/cake/tests/cases/libs/model/connection_manager.test.php
index 00b850b02..f44c18edd 100644
--- a/cake/tests/cases/libs/model/connection_manager.test.php
+++ b/cake/tests/cases/libs/model/connection_manager.test.php
@@ -6,13 +6,12 @@
  *
  * PHP versions 4 and 5
  *
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
index 55acd701e..5188f24fd 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.model.datasources.dbo
  * @since         CakePHP(tm) v 0.2.9
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
index fa969cb86..286569656 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
index 1f4a4f919..f3dccc199 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
index 0431f7d7f..f3de27127 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
index af956e4dc..40063ddf8 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
index 2c2b628d9..03ebfd919 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
index e4e0fbcf7..3cf4cbf1a 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
@@ -5,15 +5,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs
  * @since         CakePHP(tm) v 1.2.0
diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
index 7fe1a5a21..0b3364b5d 100644
--- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *	Licensed under The Open Group Test Suite License
  *	Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model.datasources
diff --git a/cake/tests/cases/libs/model/db_acl.test.php b/cake/tests/cases/libs/model/db_acl.test.php
index 2de13d0a0..08cecedf8 100644
--- a/cake/tests/cases/libs/model/db_acl.test.php
+++ b/cake/tests/cases/libs/model/db_acl.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller.components.dbacl.models
diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php
index bf420f6a4..044bba9cf 100644
--- a/cake/tests/cases/libs/model/model.test.php
+++ b/cake/tests/cases/libs/model/model.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/model_delete.test.php b/cake/tests/cases/libs/model/model_delete.test.php
index 0742d80d0..e2d4874f8 100644
--- a/cake/tests/cases/libs/model/model_delete.test.php
+++ b/cake/tests/cases/libs/model/model_delete.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php
index 43cd16e47..3da333592 100644
--- a/cake/tests/cases/libs/model/model_integration.test.php
+++ b/cake/tests/cases/libs/model/model_integration.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php
index 2f52bc525..7cb53551e 100644
--- a/cake/tests/cases/libs/model/model_read.test.php
+++ b/cake/tests/cases/libs/model/model_read.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/cake/tests/cases/libs/model/model_validation.test.php
index 7f452bedd..bd2335db0 100644
--- a/cake/tests/cases/libs/model/model_validation.test.php
+++ b/cake/tests/cases/libs/model/model_validation.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
index ea216e5f9..f57dc0eb4 100644
--- a/cake/tests/cases/libs/model/model_write.test.php
+++ b/cake/tests/cases/libs/model/model_write.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index b86779ddb..f15217b96 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/schema.test.php b/cake/tests/cases/libs/model/schema.test.php
index 2a00095d1..f9cce426e 100644
--- a/cake/tests/cases/libs/model/schema.test.php
+++ b/cake/tests/cases/libs/model/schema.test.php
@@ -7,13 +7,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/multibyte.test.php b/cake/tests/cases/libs/multibyte.test.php
index b33cc3798..bfca25440 100644
--- a/cake/tests/cases/libs/multibyte.test.php
+++ b/cake/tests/cases/libs/multibyte.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/object.test.php b/cake/tests/cases/libs/object.test.php
index c5894c7cb..8993d8204 100644
--- a/cake/tests/cases/libs/object.test.php
+++ b/cake/tests/cases/libs/object.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/overloadable.test.php b/cake/tests/cases/libs/overloadable.test.php
index 0b6c9c235..807458011 100644
--- a/cake/tests/cases/libs/overloadable.test.php
+++ b/cake/tests/cases/libs/overloadable.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index 2f34423c6..409ef9e7b 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *	Licensed under The Open Group Test Suite License
  *	Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/sanitize.test.php b/cake/tests/cases/libs/sanitize.test.php
index f32371bf1..159b409d3 100644
--- a/cake/tests/cases/libs/sanitize.test.php
+++ b/cake/tests/cases/libs/sanitize.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/security.test.php b/cake/tests/cases/libs/security.test.php
index 320f4a508..307d19415 100644
--- a/cake/tests/cases/libs/security.test.php
+++ b/cake/tests/cases/libs/security.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/session.test.php b/cake/tests/cases/libs/session.test.php
index 9af6d79d4..22b2196a8 100644
--- a/cake/tests/cases/libs/session.test.php
+++ b/cake/tests/cases/libs/session.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index 6f41670c7..a42d0cc9e 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/socket.test.php b/cake/tests/cases/libs/socket.test.php
index e401917bc..d5c0dfa34 100644
--- a/cake/tests/cases/libs/socket.test.php
+++ b/cake/tests/cases/libs/socket.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/string.test.php b/cake/tests/cases/libs/string.test.php
index 0f6896fa5..738eba270 100644
--- a/cake/tests/cases/libs/string.test.php
+++ b/cake/tests/cases/libs/string.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/test_manager.test.php b/cake/tests/cases/libs/test_manager.test.php
index f26f8bc0c..19329189f 100644
--- a/cake/tests/cases/libs/test_manager.test.php
+++ b/cake/tests/cases/libs/test_manager.test.php
@@ -15,8 +15,7 @@
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php
index 45e85da10..3adb5d38f 100644
--- a/cake/tests/cases/libs/validation.test.php
+++ b/cake/tests/cases/libs/validation.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/view/helper.test.php b/cake/tests/cases/libs/view/helper.test.php
index 8be56b040..cdb0eea09 100644
--- a/cake/tests/cases/libs/view/helper.test.php
+++ b/cake/tests/cases/libs/view/helper.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/view/helpers/ajax.test.php b/cake/tests/cases/libs/view/helpers/ajax.test.php
index 133389350..6df2e9c50 100644
--- a/cake/tests/cases/libs/view/helpers/ajax.test.php
+++ b/cake/tests/cases/libs/view/helpers/ajax.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/cache.test.php b/cake/tests/cases/libs/view/helpers/cache.test.php
index f6b265e6e..55ca4b0b9 100644
--- a/cake/tests/cases/libs/view/helpers/cache.test.php
+++ b/cake/tests/cases/libs/view/helpers/cache.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index c94ea6c2d..db6811142 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -13,7 +13,6 @@
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
index 39249c7c3..2ade552ad 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -13,7 +13,6 @@
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
diff --git a/cake/tests/cases/libs/view/helpers/javascript.test.php b/cake/tests/cases/libs/view/helpers/javascript.test.php
index b5d298f80..e9bffea7a 100644
--- a/cake/tests/cases/libs/view/helpers/javascript.test.php
+++ b/cake/tests/cases/libs/view/helpers/javascript.test.php
@@ -13,7 +13,6 @@
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php
index 8978b4201..60f53167b 100644
--- a/cake/tests/cases/libs/view/helpers/js.test.php
+++ b/cake/tests/cases/libs/view/helpers/js.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/number.test.php b/cake/tests/cases/libs/view/helpers/number.test.php
index 4784a6198..399542e7d 100644
--- a/cake/tests/cases/libs/view/helpers/number.test.php
+++ b/cake/tests/cases/libs/view/helpers/number.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 22744f2a1..9f8ca3b0b 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/rss.test.php b/cake/tests/cases/libs/view/helpers/rss.test.php
index 49c534911..750c89ff0 100644
--- a/cake/tests/cases/libs/view/helpers/rss.test.php
+++ b/cake/tests/cases/libs/view/helpers/rss.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php
index 9c56ddc81..5d278d25b 100644
--- a/cake/tests/cases/libs/view/helpers/session.test.php
+++ b/cake/tests/cases/libs/view/helpers/session.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/text.test.php b/cake/tests/cases/libs/view/helpers/text.test.php
index 283e17df0..c6a5ec7bf 100644
--- a/cake/tests/cases/libs/view/helpers/text.test.php
+++ b/cake/tests/cases/libs/view/helpers/text.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/time.test.php b/cake/tests/cases/libs/view/helpers/time.test.php
index 149e895c0..b2ab6dece 100644
--- a/cake/tests/cases/libs/view/helpers/time.test.php
+++ b/cake/tests/cases/libs/view/helpers/time.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/helpers/xml.test.php b/cake/tests/cases/libs/view/helpers/xml.test.php
index 6ffa9c2a7..03c8ae1ac 100644
--- a/cake/tests/cases/libs/view/helpers/xml.test.php
+++ b/cake/tests/cases/libs/view/helpers/xml.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs.view.helpers
diff --git a/cake/tests/cases/libs/view/theme.test.php b/cake/tests/cases/libs/view/theme.test.php
index f5f0598f2..3564ab168 100644
--- a/cake/tests/cases/libs/view/theme.test.php
+++ b/cake/tests/cases/libs/view/theme.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/view/view.test.php b/cake/tests/cases/libs/view/view.test.php
index 03174e592..7be93d513 100644
--- a/cake/tests/cases/libs/view/view.test.php
+++ b/cake/tests/cases/libs/view/view.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php
index e252ed188..bb71e1456 100644
--- a/cake/tests/cases/libs/xml.test.php
+++ b/cake/tests/cases/libs/xml.test.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/fixtures/account_fixture.php b/cake/tests/fixtures/account_fixture.php
index 0b725813e..fc0ac676a 100644
--- a/cake/tests/fixtures/account_fixture.php
+++ b/cake/tests/fixtures/account_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/aco_action_fixture.php b/cake/tests/fixtures/aco_action_fixture.php
index 638908666..595c0c7b1 100644
--- a/cake/tests/fixtures/aco_action_fixture.php
+++ b/cake/tests/fixtures/aco_action_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/aco_fixture.php b/cake/tests/fixtures/aco_fixture.php
index 98f4c5ea6..3bedaed22 100644
--- a/cake/tests/fixtures/aco_fixture.php
+++ b/cake/tests/fixtures/aco_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/aco_two_fixture.php b/cake/tests/fixtures/aco_two_fixture.php
index 09e383005..e0d94f8d7 100644
--- a/cake/tests/fixtures/aco_two_fixture.php
+++ b/cake/tests/fixtures/aco_two_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/ad_fixture.php b/cake/tests/fixtures/ad_fixture.php
index 370f98daa..17c873b34 100644
--- a/cake/tests/fixtures/ad_fixture.php
+++ b/cake/tests/fixtures/ad_fixture.php
@@ -12,7 +12,6 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
  * @link          http://www.cakephp.org
  * @package       cake
diff --git a/cake/tests/fixtures/advertisement_fixture.php b/cake/tests/fixtures/advertisement_fixture.php
index 81ad9251e..18a625319 100644
--- a/cake/tests/fixtures/advertisement_fixture.php
+++ b/cake/tests/fixtures/advertisement_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/after_tree_fixture.php b/cake/tests/fixtures/after_tree_fixture.php
index 68cd6fba7..45e2d0948 100644
--- a/cake/tests/fixtures/after_tree_fixture.php
+++ b/cake/tests/fixtures/after_tree_fixture.php
@@ -12,7 +12,6 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
  * @link          http://www.cakephp.org
  * @package       cake
diff --git a/cake/tests/fixtures/another_article_fixture.php b/cake/tests/fixtures/another_article_fixture.php
index 55762f990..a074e04be 100644
--- a/cake/tests/fixtures/another_article_fixture.php
+++ b/cake/tests/fixtures/another_article_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/apple_fixture.php b/cake/tests/fixtures/apple_fixture.php
index 737cb327e..16558acdd 100644
--- a/cake/tests/fixtures/apple_fixture.php
+++ b/cake/tests/fixtures/apple_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/aro_fixture.php b/cake/tests/fixtures/aro_fixture.php
index 39a23160e..ea437a7e8 100644
--- a/cake/tests/fixtures/aro_fixture.php
+++ b/cake/tests/fixtures/aro_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/aro_two_fixture.php b/cake/tests/fixtures/aro_two_fixture.php
index 439c23dce..c3c7973ff 100644
--- a/cake/tests/fixtures/aro_two_fixture.php
+++ b/cake/tests/fixtures/aro_two_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/aros_aco_fixture.php b/cake/tests/fixtures/aros_aco_fixture.php
index ef2e788c1..85595a1bd 100644
--- a/cake/tests/fixtures/aros_aco_fixture.php
+++ b/cake/tests/fixtures/aros_aco_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/aros_aco_two_fixture.php b/cake/tests/fixtures/aros_aco_two_fixture.php
index ef0e8bb73..9d918ca04 100644
--- a/cake/tests/fixtures/aros_aco_two_fixture.php
+++ b/cake/tests/fixtures/aros_aco_two_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/article_featured_fixture.php b/cake/tests/fixtures/article_featured_fixture.php
index 2e240e9c0..9805521ac 100644
--- a/cake/tests/fixtures/article_featured_fixture.php
+++ b/cake/tests/fixtures/article_featured_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/article_featureds_tags_fixture.php b/cake/tests/fixtures/article_featureds_tags_fixture.php
index da2186614..e07522b6b 100644
--- a/cake/tests/fixtures/article_featureds_tags_fixture.php
+++ b/cake/tests/fixtures/article_featureds_tags_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/article_fixture.php b/cake/tests/fixtures/article_fixture.php
index 4756ea553..7c1f12188 100644
--- a/cake/tests/fixtures/article_fixture.php
+++ b/cake/tests/fixtures/article_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/articles_tag_fixture.php b/cake/tests/fixtures/articles_tag_fixture.php
index 23ab707b5..bb7ea58ae 100644
--- a/cake/tests/fixtures/articles_tag_fixture.php
+++ b/cake/tests/fixtures/articles_tag_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/attachment_fixture.php b/cake/tests/fixtures/attachment_fixture.php
index 114f58324..83bef4332 100644
--- a/cake/tests/fixtures/attachment_fixture.php
+++ b/cake/tests/fixtures/attachment_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/auth_user_custom_field_fixture.php b/cake/tests/fixtures/auth_user_custom_field_fixture.php
index 7d8738863..ffb49cb40 100644
--- a/cake/tests/fixtures/auth_user_custom_field_fixture.php
+++ b/cake/tests/fixtures/auth_user_custom_field_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/auth_user_fixture.php b/cake/tests/fixtures/auth_user_fixture.php
index bfb98b28b..afd73e45c 100644
--- a/cake/tests/fixtures/auth_user_fixture.php
+++ b/cake/tests/fixtures/auth_user_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/author_fixture.php b/cake/tests/fixtures/author_fixture.php
index 2246c8e32..d61399e07 100644
--- a/cake/tests/fixtures/author_fixture.php
+++ b/cake/tests/fixtures/author_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/basket_fixture.php b/cake/tests/fixtures/basket_fixture.php
index ee3182294..b6b52ad22 100644
--- a/cake/tests/fixtures/basket_fixture.php
+++ b/cake/tests/fixtures/basket_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/bid_fixture.php b/cake/tests/fixtures/bid_fixture.php
index aba5dff90..143904dbd 100644
--- a/cake/tests/fixtures/bid_fixture.php
+++ b/cake/tests/fixtures/bid_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/binary_test_fixture.php b/cake/tests/fixtures/binary_test_fixture.php
index a94fde403..8eaca360f 100644
--- a/cake/tests/fixtures/binary_test_fixture.php
+++ b/cake/tests/fixtures/binary_test_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/book_fixture.php b/cake/tests/fixtures/book_fixture.php
index b86499c58..805f57a19 100644
--- a/cake/tests/fixtures/book_fixture.php
+++ b/cake/tests/fixtures/book_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/cache_test_model_fixture.php b/cake/tests/fixtures/cache_test_model_fixture.php
index b31917db3..8685e1488 100644
--- a/cake/tests/fixtures/cache_test_model_fixture.php
+++ b/cake/tests/fixtures/cache_test_model_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/callback_fixture.php b/cake/tests/fixtures/callback_fixture.php
index e69af02d8..bffecb6bd 100644
--- a/cake/tests/fixtures/callback_fixture.php
+++ b/cake/tests/fixtures/callback_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/campaign_fixture.php b/cake/tests/fixtures/campaign_fixture.php
index 2e91feb5e..cdb2a1aa0 100644
--- a/cake/tests/fixtures/campaign_fixture.php
+++ b/cake/tests/fixtures/campaign_fixture.php
@@ -12,7 +12,6 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
  * @link          http://www.cakephp.org
  * @package       cake
diff --git a/cake/tests/fixtures/category_fixture.php b/cake/tests/fixtures/category_fixture.php
index 4d479c1e7..3ca2555ab 100644
--- a/cake/tests/fixtures/category_fixture.php
+++ b/cake/tests/fixtures/category_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/category_thread_fixture.php b/cake/tests/fixtures/category_thread_fixture.php
index 67e28e99a..6f0db6ec3 100644
--- a/cake/tests/fixtures/category_thread_fixture.php
+++ b/cake/tests/fixtures/category_thread_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/cd_fixture.php b/cake/tests/fixtures/cd_fixture.php
index 241fd7a1e..ee522362e 100644
--- a/cake/tests/fixtures/cd_fixture.php
+++ b/cake/tests/fixtures/cd_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/comment_fixture.php b/cake/tests/fixtures/comment_fixture.php
index 0f0aea284..4875d4259 100644
--- a/cake/tests/fixtures/comment_fixture.php
+++ b/cake/tests/fixtures/comment_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/content_account_fixture.php b/cake/tests/fixtures/content_account_fixture.php
index a4b8c4f35..9b1147cdf 100644
--- a/cake/tests/fixtures/content_account_fixture.php
+++ b/cake/tests/fixtures/content_account_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/content_fixture.php b/cake/tests/fixtures/content_fixture.php
index 88b0eb249..04f8f901b 100644
--- a/cake/tests/fixtures/content_fixture.php
+++ b/cake/tests/fixtures/content_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/counter_cache_post_fixture.php b/cake/tests/fixtures/counter_cache_post_fixture.php
index 5fa7a50b8..d99df71bf 100644
--- a/cake/tests/fixtures/counter_cache_post_fixture.php
+++ b/cake/tests/fixtures/counter_cache_post_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php b/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
index 3d7ba8084..6dfda552c 100644
--- a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
+++ b/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/counter_cache_user_fixture.php b/cake/tests/fixtures/counter_cache_user_fixture.php
index 1e22b5764..b2b45abf5 100644
--- a/cake/tests/fixtures/counter_cache_user_fixture.php
+++ b/cake/tests/fixtures/counter_cache_user_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php b/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
index 80b103f1e..1d0b070d4 100644
--- a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
+++ b/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/data_test_fixture.php b/cake/tests/fixtures/data_test_fixture.php
index 12fccd88c..3d7e31cc7 100644
--- a/cake/tests/fixtures/data_test_fixture.php
+++ b/cake/tests/fixtures/data_test_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/datatype_fixture.php b/cake/tests/fixtures/datatype_fixture.php
index 09b7240c7..6414f2d2c 100644
--- a/cake/tests/fixtures/datatype_fixture.php
+++ b/cake/tests/fixtures/datatype_fixture.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.7026
diff --git a/cake/tests/fixtures/dependency_fixture.php b/cake/tests/fixtures/dependency_fixture.php
index 4279804f7..e9574b83f 100644
--- a/cake/tests/fixtures/dependency_fixture.php
+++ b/cake/tests/fixtures/dependency_fixture.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6879//Correct version number as needed**
diff --git a/cake/tests/fixtures/device_fixture.php b/cake/tests/fixtures/device_fixture.php
index 58233484f..0f2f36bcb 100644
--- a/cake/tests/fixtures/device_fixture.php
+++ b/cake/tests/fixtures/device_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/device_type_category_fixture.php b/cake/tests/fixtures/device_type_category_fixture.php
index d4d324271..34d5e1594 100644
--- a/cake/tests/fixtures/device_type_category_fixture.php
+++ b/cake/tests/fixtures/device_type_category_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/device_type_fixture.php b/cake/tests/fixtures/device_type_fixture.php
index fdc1650a6..b617f1f3b 100644
--- a/cake/tests/fixtures/device_type_fixture.php
+++ b/cake/tests/fixtures/device_type_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/document_directory_fixture.php b/cake/tests/fixtures/document_directory_fixture.php
index 30d8767cd..f8f72332c 100644
--- a/cake/tests/fixtures/document_directory_fixture.php
+++ b/cake/tests/fixtures/document_directory_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/document_fixture.php b/cake/tests/fixtures/document_fixture.php
index 0587dada8..84425d822 100644
--- a/cake/tests/fixtures/document_fixture.php
+++ b/cake/tests/fixtures/document_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/exterior_type_category_fixture.php b/cake/tests/fixtures/exterior_type_category_fixture.php
index 96a7ff5eb..48fe346bb 100644
--- a/cake/tests/fixtures/exterior_type_category_fixture.php
+++ b/cake/tests/fixtures/exterior_type_category_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/feature_set_fixture.php b/cake/tests/fixtures/feature_set_fixture.php
index 3d5ce3016..d50300d25 100644
--- a/cake/tests/fixtures/feature_set_fixture.php
+++ b/cake/tests/fixtures/feature_set_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/featured_fixture.php b/cake/tests/fixtures/featured_fixture.php
index e40e1ccec..c03b259d3 100644
--- a/cake/tests/fixtures/featured_fixture.php
+++ b/cake/tests/fixtures/featured_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/film_file_fixture.php b/cake/tests/fixtures/film_file_fixture.php
index e815980fd..f5eb15dfb 100644
--- a/cake/tests/fixtures/film_file_fixture.php
+++ b/cake/tests/fixtures/film_file_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/flag_tree_fixture.php b/cake/tests/fixtures/flag_tree_fixture.php
index 7dbff7ce2..16d12a914 100644
--- a/cake/tests/fixtures/flag_tree_fixture.php
+++ b/cake/tests/fixtures/flag_tree_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/fruit_fixture.php b/cake/tests/fixtures/fruit_fixture.php
index e8bf6fb91..8e001be52 100644
--- a/cake/tests/fixtures/fruit_fixture.php
+++ b/cake/tests/fixtures/fruit_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/fruits_uuid_tag_fixture.php b/cake/tests/fixtures/fruits_uuid_tag_fixture.php
index 9640e6d01..0e2e97323 100644
--- a/cake/tests/fixtures/fruits_uuid_tag_fixture.php
+++ b/cake/tests/fixtures/fruits_uuid_tag_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/home_fixture.php b/cake/tests/fixtures/home_fixture.php
index 2d48f6079..5c622b503 100644
--- a/cake/tests/fixtures/home_fixture.php
+++ b/cake/tests/fixtures/home_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/image_fixture.php b/cake/tests/fixtures/image_fixture.php
index a3271d9e1..dd9b22d96 100644
--- a/cake/tests/fixtures/image_fixture.php
+++ b/cake/tests/fixtures/image_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/item_fixture.php b/cake/tests/fixtures/item_fixture.php
index 5ec284934..3ab6d4449 100644
--- a/cake/tests/fixtures/item_fixture.php
+++ b/cake/tests/fixtures/item_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/items_portfolio_fixture.php b/cake/tests/fixtures/items_portfolio_fixture.php
index d9dae1642..fa746c2aa 100644
--- a/cake/tests/fixtures/items_portfolio_fixture.php
+++ b/cake/tests/fixtures/items_portfolio_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/join_a_b_fixture.php b/cake/tests/fixtures/join_a_b_fixture.php
index af2245ace..3013fc567 100644
--- a/cake/tests/fixtures/join_a_b_fixture.php
+++ b/cake/tests/fixtures/join_a_b_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/join_a_c_fixture.php b/cake/tests/fixtures/join_a_c_fixture.php
index bee0c1ac2..f89f3db0e 100644
--- a/cake/tests/fixtures/join_a_c_fixture.php
+++ b/cake/tests/fixtures/join_a_c_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/join_a_fixture.php b/cake/tests/fixtures/join_a_fixture.php
index 648de4e90..947a5166d 100644
--- a/cake/tests/fixtures/join_a_fixture.php
+++ b/cake/tests/fixtures/join_a_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/join_b_fixture.php b/cake/tests/fixtures/join_b_fixture.php
index a0508f31a..581a5cf55 100644
--- a/cake/tests/fixtures/join_b_fixture.php
+++ b/cake/tests/fixtures/join_b_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/join_c_fixture.php b/cake/tests/fixtures/join_c_fixture.php
index 699ff72ff..38abbb167 100644
--- a/cake/tests/fixtures/join_c_fixture.php
+++ b/cake/tests/fixtures/join_c_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/join_thing_fixture.php b/cake/tests/fixtures/join_thing_fixture.php
index b89a47a29..92df9dbbb 100644
--- a/cake/tests/fixtures/join_thing_fixture.php
+++ b/cake/tests/fixtures/join_thing_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/message_fixture.php b/cake/tests/fixtures/message_fixture.php
index 18236dd97..0e85e52da 100644
--- a/cake/tests/fixtures/message_fixture.php
+++ b/cake/tests/fixtures/message_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/my_categories_my_products_fixture.php b/cake/tests/fixtures/my_categories_my_products_fixture.php
index 36b2ab05a..93d0fe803 100644
--- a/cake/tests/fixtures/my_categories_my_products_fixture.php
+++ b/cake/tests/fixtures/my_categories_my_products_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/my_categories_my_users_fixture.php b/cake/tests/fixtures/my_categories_my_users_fixture.php
index 166c7983f..acdee1906 100644
--- a/cake/tests/fixtures/my_categories_my_users_fixture.php
+++ b/cake/tests/fixtures/my_categories_my_users_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/my_category_fixture.php b/cake/tests/fixtures/my_category_fixture.php
index 66e837eff..79c02659a 100644
--- a/cake/tests/fixtures/my_category_fixture.php
+++ b/cake/tests/fixtures/my_category_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/my_product_fixture.php b/cake/tests/fixtures/my_product_fixture.php
index b28fbfa60..59f386ae0 100644
--- a/cake/tests/fixtures/my_product_fixture.php
+++ b/cake/tests/fixtures/my_product_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/my_user_fixture.php b/cake/tests/fixtures/my_user_fixture.php
index 62c58c8cc..d59f1445c 100644
--- a/cake/tests/fixtures/my_user_fixture.php
+++ b/cake/tests/fixtures/my_user_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/node_fixture.php b/cake/tests/fixtures/node_fixture.php
index ce06f394b..6329abc52 100644
--- a/cake/tests/fixtures/node_fixture.php
+++ b/cake/tests/fixtures/node_fixture.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.tests.fixtures
  * @since         CakePHP(tm) v 1.2.0.6879 //Correct version number as needed**
diff --git a/cake/tests/fixtures/number_tree_fixture.php b/cake/tests/fixtures/number_tree_fixture.php
index f4aa42ef1..36833ef4c 100644
--- a/cake/tests/fixtures/number_tree_fixture.php
+++ b/cake/tests/fixtures/number_tree_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/number_tree_two_fixture.php b/cake/tests/fixtures/number_tree_two_fixture.php
index e45e29d80..c7e4b8809 100644
--- a/cake/tests/fixtures/number_tree_two_fixture.php
+++ b/cake/tests/fixtures/number_tree_two_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/numeric_article_fixture.php b/cake/tests/fixtures/numeric_article_fixture.php
index c51a61ff2..fe0062d94 100644
--- a/cake/tests/fixtures/numeric_article_fixture.php
+++ b/cake/tests/fixtures/numeric_article_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/overall_favorite_fixture.php b/cake/tests/fixtures/overall_favorite_fixture.php
index 2f0889e83..d0cf1f384 100644
--- a/cake/tests/fixtures/overall_favorite_fixture.php
+++ b/cake/tests/fixtures/overall_favorite_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/person_fixture.php b/cake/tests/fixtures/person_fixture.php
index 6a803a898..3f0ab5345 100644
--- a/cake/tests/fixtures/person_fixture.php
+++ b/cake/tests/fixtures/person_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/portfolio_fixture.php b/cake/tests/fixtures/portfolio_fixture.php
index 83d22eed7..5b7dec416 100644
--- a/cake/tests/fixtures/portfolio_fixture.php
+++ b/cake/tests/fixtures/portfolio_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/post_fixture.php b/cake/tests/fixtures/post_fixture.php
index 543b67302..750714c3b 100644
--- a/cake/tests/fixtures/post_fixture.php
+++ b/cake/tests/fixtures/post_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/posts_tag_fixture.php b/cake/tests/fixtures/posts_tag_fixture.php
index 02ee01854..32f479087 100644
--- a/cake/tests/fixtures/posts_tag_fixture.php
+++ b/cake/tests/fixtures/posts_tag_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/primary_model_fixture.php b/cake/tests/fixtures/primary_model_fixture.php
index 119de59ed..89e92bc25 100644
--- a/cake/tests/fixtures/primary_model_fixture.php
+++ b/cake/tests/fixtures/primary_model_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/product_fixture.php b/cake/tests/fixtures/product_fixture.php
index ccdbf5aa8..6a096f99e 100644
--- a/cake/tests/fixtures/product_fixture.php
+++ b/cake/tests/fixtures/product_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/project_fixture.php b/cake/tests/fixtures/project_fixture.php
index 88c572063..548293e61 100644
--- a/cake/tests/fixtures/project_fixture.php
+++ b/cake/tests/fixtures/project_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/sample_fixture.php b/cake/tests/fixtures/sample_fixture.php
index 126d8872d..c95fe484a 100644
--- a/cake/tests/fixtures/sample_fixture.php
+++ b/cake/tests/fixtures/sample_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/secondary_model_fixture.php b/cake/tests/fixtures/secondary_model_fixture.php
index aa2c02f8d..ec4701570 100644
--- a/cake/tests/fixtures/secondary_model_fixture.php
+++ b/cake/tests/fixtures/secondary_model_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/session_fixture.php b/cake/tests/fixtures/session_fixture.php
index b5a070471..f75df31ec 100644
--- a/cake/tests/fixtures/session_fixture.php
+++ b/cake/tests/fixtures/session_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/something_else_fixture.php b/cake/tests/fixtures/something_else_fixture.php
index 80cfecb28..457d3fd54 100644
--- a/cake/tests/fixtures/something_else_fixture.php
+++ b/cake/tests/fixtures/something_else_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/something_fixture.php b/cake/tests/fixtures/something_fixture.php
index 8d3d6bce2..016e60baa 100644
--- a/cake/tests/fixtures/something_fixture.php
+++ b/cake/tests/fixtures/something_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/stories_tag_fixture.php b/cake/tests/fixtures/stories_tag_fixture.php
index a5e4163eb..42baf6273 100644
--- a/cake/tests/fixtures/stories_tag_fixture.php
+++ b/cake/tests/fixtures/stories_tag_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/story_fixture.php b/cake/tests/fixtures/story_fixture.php
index c16a54f6c..6e4b5db98 100644
--- a/cake/tests/fixtures/story_fixture.php
+++ b/cake/tests/fixtures/story_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/syfile_fixture.php b/cake/tests/fixtures/syfile_fixture.php
index c9251411c..80cbed5c9 100644
--- a/cake/tests/fixtures/syfile_fixture.php
+++ b/cake/tests/fixtures/syfile_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/tag_fixture.php b/cake/tests/fixtures/tag_fixture.php
index c2b127d4f..0c4c8c65a 100644
--- a/cake/tests/fixtures/tag_fixture.php
+++ b/cake/tests/fixtures/tag_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/test_plugin_article_fixture.php b/cake/tests/fixtures/test_plugin_article_fixture.php
index dcf6a92d4..896667597 100644
--- a/cake/tests/fixtures/test_plugin_article_fixture.php
+++ b/cake/tests/fixtures/test_plugin_article_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/test_plugin_comment_fixture.php b/cake/tests/fixtures/test_plugin_comment_fixture.php
index 544ecf093..facc0b220 100644
--- a/cake/tests/fixtures/test_plugin_comment_fixture.php
+++ b/cake/tests/fixtures/test_plugin_comment_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/the_paper_monkies_fixture.php b/cake/tests/fixtures/the_paper_monkies_fixture.php
index 8eeeac2e6..906c246f7 100644
--- a/cake/tests/fixtures/the_paper_monkies_fixture.php
+++ b/cake/tests/fixtures/the_paper_monkies_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/thread_fixture.php b/cake/tests/fixtures/thread_fixture.php
index 7e3239666..84326a832 100644
--- a/cake/tests/fixtures/thread_fixture.php
+++ b/cake/tests/fixtures/thread_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/translate_article_fixture.php b/cake/tests/fixtures/translate_article_fixture.php
index b3ed14a7b..e3df34d9b 100644
--- a/cake/tests/fixtures/translate_article_fixture.php
+++ b/cake/tests/fixtures/translate_article_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/translate_fixture.php b/cake/tests/fixtures/translate_fixture.php
index 28539aad9..70beac205 100644
--- a/cake/tests/fixtures/translate_fixture.php
+++ b/cake/tests/fixtures/translate_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/translate_table_fixture.php b/cake/tests/fixtures/translate_table_fixture.php
index 282474990..d694e7678 100644
--- a/cake/tests/fixtures/translate_table_fixture.php
+++ b/cake/tests/fixtures/translate_table_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/translate_with_prefix_fixture.php b/cake/tests/fixtures/translate_with_prefix_fixture.php
index f8e3fc44a..a26e1e7f0 100644
--- a/cake/tests/fixtures/translate_with_prefix_fixture.php
+++ b/cake/tests/fixtures/translate_with_prefix_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/translated_article_fixture.php b/cake/tests/fixtures/translated_article_fixture.php
index eb4c63cad..f3e468fc6 100644
--- a/cake/tests/fixtures/translated_article_fixture.php
+++ b/cake/tests/fixtures/translated_article_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/translated_item_fixture.php b/cake/tests/fixtures/translated_item_fixture.php
index 98b869752..82dc33f05 100644
--- a/cake/tests/fixtures/translated_item_fixture.php
+++ b/cake/tests/fixtures/translated_item_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/unconventional_tree_fixture.php b/cake/tests/fixtures/unconventional_tree_fixture.php
index 3685b5a2d..6f2c671e3 100644
--- a/cake/tests/fixtures/unconventional_tree_fixture.php
+++ b/cake/tests/fixtures/unconventional_tree_fixture.php
@@ -6,13 +6,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/underscore_field_fixture.php b/cake/tests/fixtures/underscore_field_fixture.php
index ff4facd9c..5e009688c 100644
--- a/cake/tests/fixtures/underscore_field_fixture.php
+++ b/cake/tests/fixtures/underscore_field_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/user_fixture.php b/cake/tests/fixtures/user_fixture.php
index 16ba42a4a..1464fb183 100644
--- a/cake/tests/fixtures/user_fixture.php
+++ b/cake/tests/fixtures/user_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/uuid_fixture.php b/cake/tests/fixtures/uuid_fixture.php
index 8a00e9b8f..8713f395e 100644
--- a/cake/tests/fixtures/uuid_fixture.php
+++ b/cake/tests/fixtures/uuid_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/uuid_tag_fixture.php b/cake/tests/fixtures/uuid_tag_fixture.php
index cb4c6203e..502c8135d 100644
--- a/cake/tests/fixtures/uuid_tag_fixture.php
+++ b/cake/tests/fixtures/uuid_tag_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/uuid_tree_fixture.php b/cake/tests/fixtures/uuid_tree_fixture.php
index 7fa73e5d1..0063ebe1d 100644
--- a/cake/tests/fixtures/uuid_tree_fixture.php
+++ b/cake/tests/fixtures/uuid_tree_fixture.php
@@ -6,13 +6,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/uuiditem_fixture.php b/cake/tests/fixtures/uuiditem_fixture.php
index 540b30984..4d8764d7e 100644
--- a/cake/tests/fixtures/uuiditem_fixture.php
+++ b/cake/tests/fixtures/uuiditem_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php b/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
index 1c22f17cb..41a7d9cb3 100644
--- a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
+++ b/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php b/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
index c70684bfd..43259dcd7 100644
--- a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
+++ b/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/uuidportfolio_fixture.php b/cake/tests/fixtures/uuidportfolio_fixture.php
index 6006e0dbc..76042573b 100644
--- a/cake/tests/fixtures/uuidportfolio_fixture.php
+++ b/cake/tests/fixtures/uuidportfolio_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/groups/acl.group.php b/cake/tests/groups/acl.group.php
index a3882d0ab..8c463b659 100644
--- a/cake/tests/groups/acl.group.php
+++ b/cake/tests/groups/acl.group.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/cache.group.php b/cake/tests/groups/cache.group.php
index 4dd0d69c3..c53e9a3e9 100644
--- a/cake/tests/groups/cache.group.php
+++ b/cake/tests/groups/cache.group.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/components.group.php b/cake/tests/groups/components.group.php
index 16817efcf..5f8561f9c 100644
--- a/cake/tests/groups/components.group.php
+++ b/cake/tests/groups/components.group.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/configure.group.php b/cake/tests/groups/configure.group.php
index bc0d02642..afa87fa53 100644
--- a/cake/tests/groups/configure.group.php
+++ b/cake/tests/groups/configure.group.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/console.group.php b/cake/tests/groups/console.group.php
index bc8f72009..d65c03a41 100644
--- a/cake/tests/groups/console.group.php
+++ b/cake/tests/groups/console.group.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/controller.group.php b/cake/tests/groups/controller.group.php
index a8504c393..3efc300db 100644
--- a/cake/tests/groups/controller.group.php
+++ b/cake/tests/groups/controller.group.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/database.group.php b/cake/tests/groups/database.group.php
index 147d077a3..6dc16033c 100644
--- a/cake/tests/groups/database.group.php
+++ b/cake/tests/groups/database.group.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/helpers.group.php b/cake/tests/groups/helpers.group.php
index 5761386f1..05d6e577d 100644
--- a/cake/tests/groups/helpers.group.php
+++ b/cake/tests/groups/helpers.group.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/lib.group.php b/cake/tests/groups/lib.group.php
index 367b7ee10..6bb68eee9 100644
--- a/cake/tests/groups/lib.group.php
+++ b/cake/tests/groups/lib.group.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/model.group.php b/cake/tests/groups/model.group.php
index c1e6c4ab0..fc4d3c96a 100644
--- a/cake/tests/groups/model.group.php
+++ b/cake/tests/groups/model.group.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/no_cross_contamination.group.php b/cake/tests/groups/no_cross_contamination.group.php
index 71c0dcf8e..f350db8e8 100644
--- a/cake/tests/groups/no_cross_contamination.group.php
+++ b/cake/tests/groups/no_cross_contamination.group.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/routing_system.group.php b/cake/tests/groups/routing_system.group.php
index a4b9dea60..56020786e 100644
--- a/cake/tests/groups/routing_system.group.php
+++ b/cake/tests/groups/routing_system.group.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/socket.group.php b/cake/tests/groups/socket.group.php
index ea3a0a608..2475e416c 100644
--- a/cake/tests/groups/socket.group.php
+++ b/cake/tests/groups/socket.group.php
@@ -13,7 +13,6 @@
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc.
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
diff --git a/cake/tests/groups/test_suite.group.php b/cake/tests/groups/test_suite.group.php
index 1dae0759e..9bac0c7b0 100644
--- a/cake/tests/groups/test_suite.group.php
+++ b/cake/tests/groups/test_suite.group.php
@@ -13,7 +13,6 @@
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc.
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
diff --git a/cake/tests/groups/view.group.php b/cake/tests/groups/view.group.php
index 60a7f0828..015608135 100644
--- a/cake/tests/groups/view.group.php
+++ b/cake/tests/groups/view.group.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/groups/xml.group.php b/cake/tests/groups/xml.group.php
index 15a6a66e0..167dbfa57 100644
--- a/cake/tests/groups/xml.group.php
+++ b/cake/tests/groups/xml.group.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.groups
diff --git a/cake/tests/lib/cake_reporter.php b/cake/tests/lib/cake_reporter.php
index 8e44b12b5..3b4ed090f 100644
--- a/cake/tests/lib/cake_reporter.php
+++ b/cake/tests/lib/cake_reporter.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php
index 857bca729..01190f875 100644
--- a/cake/tests/lib/cake_test_case.php
+++ b/cake/tests/lib/cake_test_case.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/lib/cake_test_fixture.php b/cake/tests/lib/cake_test_fixture.php
index 1c2227ecc..37be26c51 100644
--- a/cake/tests/lib/cake_test_fixture.php
+++ b/cake/tests/lib/cake_test_fixture.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/lib/cake_test_model.php b/cake/tests/lib/cake_test_model.php
index bf2cb68bd..e119522bb 100644
--- a/cake/tests/lib/cake_test_model.php
+++ b/cake/tests/lib/cake_test_model.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/lib/cake_web_test_case.php b/cake/tests/lib/cake_web_test_case.php
index da5a12589..035f57f29 100644
--- a/cake/tests/lib/cake_web_test_case.php
+++ b/cake/tests/lib/cake_web_test_case.php
@@ -6,13 +6,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.lib
diff --git a/cake/tests/lib/cli_reporter.php b/cake/tests/lib/cli_reporter.php
index 7902ef998..b260d4040 100644
--- a/cake/tests/lib/cli_reporter.php
+++ b/cake/tests/lib/cli_reporter.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/lib/code_coverage_manager.php b/cake/tests/lib/code_coverage_manager.php
index 56e685526..60ead0772 100644
--- a/cake/tests/lib/code_coverage_manager.php
+++ b/cake/tests/lib/code_coverage_manager.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.lib
diff --git a/cake/tests/lib/content.php b/cake/tests/lib/content.php
index c07a96260..929382d1c 100644
--- a/cake/tests/lib/content.php
+++ b/cake/tests/lib/content.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.lib
diff --git a/cake/tests/lib/footer.php b/cake/tests/lib/footer.php
index 5509a2719..565cbd23b 100644
--- a/cake/tests/lib/footer.php
+++ b/cake/tests/lib/footer.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.lib
diff --git a/cake/tests/lib/header.php b/cake/tests/lib/header.php
index 6d37b39f5..bfafd3a30 100644
--- a/cake/tests/lib/header.php
+++ b/cake/tests/lib/header.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.lib
diff --git a/cake/tests/lib/simpletest.php b/cake/tests/lib/simpletest.php
index 5a06b7a11..653af49b0 100644
--- a/cake/tests/lib/simpletest.php
+++ b/cake/tests/lib/simpletest.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php
index 6f21d2f5a..5f447612e 100644
--- a/cake/tests/lib/test_manager.php
+++ b/cake/tests/lib/test_manager.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.lib
diff --git a/cake/tests/lib/xdebug.php b/cake/tests/lib/xdebug.php
index f954f5600..626ed23be 100644
--- a/cake/tests/lib/xdebug.php
+++ b/cake/tests/lib/xdebug.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.cake.tests.libs
diff --git a/cake/tests/test_app/config/acl.ini.php b/cake/tests/test_app/config/acl.ini.php
index b7b95abcd..d5e1b3394 100644
--- a/cake/tests/test_app/config/acl.ini.php
+++ b/cake/tests/test_app/config/acl.ini.php
@@ -6,15 +6,14 @@
 ; *
 ; * PHP versions 4 and 5
 ; *
-; * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
-; * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+; * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+; * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
 ; *
 ; *  Licensed under The MIT License
 ; *  Redistributions of files must retain the above copyright notice.
 ; *
-; * @filesource
-; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
-; * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+;; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+; * @link          http://cakephp.org CakePHP(tm) Project
 ; * @package       cake
 ; * @subpackage    cake.app.config
 ; * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/tests/test_app/controllers/tests_apps_controller.php b/cake/tests/test_app/controllers/tests_apps_controller.php
index 1eac7d061..0e465fb0f 100644
--- a/cake/tests/test_app/controllers/tests_apps_controller.php
+++ b/cake/tests/test_app/controllers/tests_apps_controller.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/controllers/tests_apps_posts_controller.php b/cake/tests/test_app/controllers/tests_apps_posts_controller.php
index 1634b1b5c..8db1ba2af 100644
--- a/cake/tests/test_app/controllers/tests_apps_posts_controller.php
+++ b/cake/tests/test_app/controllers/tests_apps_posts_controller.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/models/behaviors/persister_one_behavior.php b/cake/tests/test_app/models/behaviors/persister_one_behavior.php
index e41957460..703432b7e 100644
--- a/cake/tests/test_app/models/behaviors/persister_one_behavior.php
+++ b/cake/tests/test_app/models/behaviors/persister_one_behavior.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.tests.test_app.models
  * @since         CakePHP(tm) v 1.2.0.5669
diff --git a/cake/tests/test_app/models/behaviors/persister_two_behavior.php b/cake/tests/test_app/models/behaviors/persister_two_behavior.php
index cebd79858..798913c1d 100644
--- a/cake/tests/test_app/models/behaviors/persister_two_behavior.php
+++ b/cake/tests/test_app/models/behaviors/persister_two_behavior.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.tests.test_app.models
  * @since         CakePHP(tm) v 1.2.0.5669
diff --git a/cake/tests/test_app/models/comment.php b/cake/tests/test_app/models/comment.php
index 5eb6eba63..497a422da 100644
--- a/cake/tests/test_app/models/comment.php
+++ b/cake/tests/test_app/models/comment.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.
  * @since         CakePHP v 1.2.0.7726
diff --git a/cake/tests/test_app/models/persister_one.php b/cake/tests/test_app/models/persister_one.php
index 8df8a4eac..f3048e4b7 100644
--- a/cake/tests/test_app/models/persister_one.php
+++ b/cake/tests/test_app/models/persister_one.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.test_app.models
  * @since         CakePHP v 1.2.0.7726
diff --git a/cake/tests/test_app/models/persister_two.php b/cake/tests/test_app/models/persister_two.php
index 417cc146b..5f8b56263 100644
--- a/cake/tests/test_app/models/persister_two.php
+++ b/cake/tests/test_app/models/persister_two.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.tests.test_app.models
  * @since         CakePHP v 1.2.0.7726
diff --git a/cake/tests/test_app/models/post.php b/cake/tests/test_app/models/post.php
index 71280e0db..6ab391e99 100644
--- a/cake/tests/test_app/models/post.php
+++ b/cake/tests/test_app/models/post.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.
  * @since         CakePHP v 1.2.0.7726
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
index 8c8c6269b..84bab0969 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
index d66e4eb3c..564671e12 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
index 3d98a2961..a24727ce8 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
index 321831152..5f9c8f931 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php b/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
index 10e43fa0a..071a37ccb 100644
--- a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
+++ b/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
index 7ffe580ed..0eb5802bc 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.tests.test_app.models
  * @since         CakePHP(tm) v 1.2.0.5669
diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
index 0d5eb05fb..860d8288c 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
@@ -7,15 +7,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.tests.test_app.models
  * @since         CakePHP(tm) v 1.2.0.5669
diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
index 56b963539..ed148e8ef 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.
  * @since         CakePHP v 1.2.0.7726
diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
index 90e6e9293..d62fa565c 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.libs.
  * @since         CakePHP v 1.2.0.7726
diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
index b72cd1eb0..d575d709c 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
@@ -13,9 +13,8 @@
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
  * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package       cake
  * @subpackage    cake.cake.tests.test_app.plugins.test_plugin
  * @since         CakePHP v 1.2.0.4487
diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
index 46a40ecb0..944818d12 100644
--- a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
+++ b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
index 1ce17fe7e..c3a2f9073 100644
--- a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
+++ b/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.cases.libs
diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php b/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
index f263537c6..49291107a 100644
--- a/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
+++ b/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.vendors.sample
diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php b/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
index e4f71f8ba..c229984a6 100644
--- a/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
+++ b/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.vendors.shells
diff --git a/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php b/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
index e116ba975..c8d261473 100644
--- a/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
+++ b/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.vendors
diff --git a/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php b/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
index 952a42824..0c74a5544 100644
--- a/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
+++ b/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php b/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
index 7611e129f..12c284e5f 100644
--- a/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
+++ b/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
diff --git a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
index f4e0635e5..ffbaa3f13 100644
--- a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
+++ b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin_two.vendors.shells
diff --git a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
index 5fb0dde2b..d30f55092 100644
--- a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
+++ b/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.plugins.test_plugin_two.vendors.shells
diff --git a/cake/tests/test_app/vendors/Test/MyTest.php b/cake/tests/test_app/vendors/Test/MyTest.php
index 7662a2d88..f61d691f1 100644
--- a/cake/tests/test_app/vendors/Test/MyTest.php
+++ b/cake/tests/test_app/vendors/Test/MyTest.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.vendors.somename
diff --git a/cake/tests/test_app/vendors/Test/hello.php b/cake/tests/test_app/vendors/Test/hello.php
index 061237d5f..97320a971 100644
--- a/cake/tests/test_app/vendors/Test/hello.php
+++ b/cake/tests/test_app/vendors/Test/hello.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.vendors.Test
diff --git a/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php b/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
index 1776b67b0..774f70839 100644
--- a/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
+++ b/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.vendors.sample
diff --git a/cake/tests/test_app/vendors/shells/sample.php b/cake/tests/test_app/vendors/shells/sample.php
index 474a855ad..773a27839 100644
--- a/cake/tests/test_app/vendors/shells/sample.php
+++ b/cake/tests/test_app/vendors/shells/sample.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.vendors.shells
diff --git a/cake/tests/test_app/vendors/somename/some.name.php b/cake/tests/test_app/vendors/somename/some.name.php
index 4507ebb35..6a815ffc8 100644
--- a/cake/tests/test_app/vendors/somename/some.name.php
+++ b/cake/tests/test_app/vendors/somename/some.name.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.vendors.somename
diff --git a/cake/tests/test_app/vendors/welcome.php b/cake/tests/test_app/vendors/welcome.php
index 25abe89a6..e3c33c636 100644
--- a/cake/tests/test_app/vendors/welcome.php
+++ b/cake/tests/test_app/vendors/welcome.php
@@ -8,13 +8,12 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  *  Licensed under The Open Group Test Suite License
  *  Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
  * @package       cake
  * @subpackage    cake.tests.test_app.vendors
diff --git a/cake/tests/test_app/views/elements/email/html/default.ctp b/cake/tests/test_app/views/elements/email/html/default.ctp
index 374923ef3..a70d09778 100644
--- a/cake/tests/test_app/views/elements/email/html/default.ctp
+++ b/cake/tests/test_app/views/elements/email/html/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/tests/test_app/views/elements/email/text/default.ctp b/cake/tests/test_app/views/elements/email/text/default.ctp
index 284acea16..d3f885b5c 100644
--- a/cake/tests/test_app/views/elements/email/text/default.ctp
+++ b/cake/tests/test_app/views/elements/email/text/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/tests/test_app/views/elements/email/text/wide.ctp b/cake/tests/test_app/views/elements/email/text/wide.ctp
index d9365aa06..312ee2e21 100644
--- a/cake/tests/test_app/views/elements/email/text/wide.ctp
+++ b/cake/tests/test_app/views/elements/email/text/wide.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.elements.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/tests/test_app/views/layouts/ajax.ctp b/cake/tests/test_app/views/layouts/ajax.ctp
index e6bd065e0..a3440dd2c 100644
--- a/cake/tests/test_app/views/layouts/ajax.ctp
+++ b/cake/tests/test_app/views/layouts/ajax.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/tests/test_app/views/layouts/ajax2.ctp b/cake/tests/test_app/views/layouts/ajax2.ctp
index c975fdfe2..779707cdf 100644
--- a/cake/tests/test_app/views/layouts/ajax2.ctp
+++ b/cake/tests/test_app/views/layouts/ajax2.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/tests/test_app/views/layouts/cache_layout.ctp b/cake/tests/test_app/views/layouts/cache_layout.ctp
index ae9a16593..901b875b6 100644
--- a/cake/tests/test_app/views/layouts/cache_layout.ctp
+++ b/cake/tests/test_app/views/layouts/cache_layout.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/tests/test_app/views/layouts/default.ctp b/cake/tests/test_app/views/layouts/default.ctp
index 50e5c0300..d47a8533b 100644
--- a/cake/tests/test_app/views/layouts/default.ctp
+++ b/cake/tests/test_app/views/layouts/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.pages
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/tests/test_app/views/layouts/email/html/default.ctp b/cake/tests/test_app/views/layouts/email/html/default.ctp
index 63573ac05..dbf7916be 100644
--- a/cake/tests/test_app/views/layouts/email/html/default.ctp
+++ b/cake/tests/test_app/views/layouts/email/html/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/tests/test_app/views/layouts/email/html/thin.ctp b/cake/tests/test_app/views/layouts/email/html/thin.ctp
index f568046be..33e905a65 100644
--- a/cake/tests/test_app/views/layouts/email/html/thin.ctp
+++ b/cake/tests/test_app/views/layouts/email/html/thin.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts.email.html
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/tests/test_app/views/layouts/email/text/default.ctp b/cake/tests/test_app/views/layouts/email/text/default.ctp
index 9a0cf7835..aeef64f2b 100644
--- a/cake/tests/test_app/views/layouts/email/text/default.ctp
+++ b/cake/tests/test_app/views/layouts/email/text/default.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts.email.text
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/tests/test_app/views/layouts/flash.ctp b/cake/tests/test_app/views/layouts/flash.ctp
index 3f17a4764..8465565d9 100644
--- a/cake/tests/test_app/views/layouts/flash.ctp
+++ b/cake/tests/test_app/views/layouts/flash.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/tests/test_app/views/layouts/multi_cache.ctp b/cake/tests/test_app/views/layouts/multi_cache.ctp
index 658537659..99f0f37fd 100644
--- a/cake/tests/test_app/views/layouts/multi_cache.ctp
+++ b/cake/tests/test_app/views/layouts/multi_cache.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.layouts
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/tests/test_app/views/posts/sequencial_nocache.ctp b/cake/tests/test_app/views/posts/sequencial_nocache.ctp
index b0b8d556f..8411db54a 100644
--- a/cake/tests/test_app/views/posts/sequencial_nocache.ctp
+++ b/cake/tests/test_app/views/posts/sequencial_nocache.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.pages
  * @since         CakePHP(tm) v 0.10.0.1076
diff --git a/cake/tests/test_app/views/posts/test_nocache_tags.ctp b/cake/tests/test_app/views/posts/test_nocache_tags.ctp
index 9dd64d8cb..7a62dddeb 100644
--- a/cake/tests/test_app/views/posts/test_nocache_tags.ctp
+++ b/cake/tests/test_app/views/posts/test_nocache_tags.ctp
@@ -4,15 +4,14 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @subpackage    cake.cake.libs.view.templates.pages
  * @since         CakePHP(tm) v 0.10.0.1076
@@ -122,7 +121,7 @@ if (!empty($filePresent)):
 <?php __('Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.'); ?>
 </p>
 <ul>
-	<li><a href="http://www.cakefoundation.org/"><?php __('Cake Software Foundation'); ?> </a>
+	<li><a href="http://cakefoundation.org/"><?php __('Cake Software Foundation'); ?> </a>
 	<ul><li><?php __('Promoting development related to CakePHP'); ?></li></ul></li>
 	<li><a href="http://bakery.cakephp.org"><?php __('The Bakery'); ?> </a>
 	<ul><li><?php __('Everything CakePHP'); ?></li></ul></li>
diff --git a/index.php b/index.php
index de5df8cfc..d34d6fedc 100644
--- a/index.php
+++ b/index.php
@@ -10,14 +10,13 @@
  * PHP versions 4 and 5
  *
  * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @filesource
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
  * @package       cake
  * @since         CakePHP(tm) v 0.2.9
  * @version       $Revision$

From 66a89108103492d9db5e865a0ccded3bf756a079 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Tue, 26 Jan 2010 17:15:15 -0500
Subject: [PATCH 171/244] Fixing cakephp domain name.

---
 app/config/acl.ini.php                                        | 2 +-
 app/config/bootstrap.php                                      | 2 +-
 app/config/core.php                                           | 2 +-
 app/config/database.php.default                               | 2 +-
 app/config/inflections.php                                    | 2 +-
 app/config/routes.php                                         | 2 +-
 app/config/sql/db_acl.php                                     | 2 +-
 app/config/sql/i18n.php                                       | 2 +-
 app/config/sql/sessions.php                                   | 2 +-
 app/index.php                                                 | 2 +-
 app/webroot/css.php                                           | 2 +-
 app/webroot/css/cake.generic.css                              | 2 +-
 app/webroot/index.php                                         | 2 +-
 app/webroot/js/vendors.php                                    | 2 +-
 cake/LICENSE.txt                                              | 2 +-
 cake/basics.php                                               | 2 +-
 cake/bootstrap.php                                            | 2 +-
 cake/config/config.php                                        | 2 +-
 cake/config/paths.php                                         | 2 +-
 cake/config/unicode/casefolding/0080_00ff.php                 | 2 +-
 cake/config/unicode/casefolding/0100_017f.php                 | 2 +-
 cake/config/unicode/casefolding/0180_024F.php                 | 2 +-
 cake/config/unicode/casefolding/0250_02af.php                 | 2 +-
 cake/config/unicode/casefolding/0370_03ff.php                 | 2 +-
 cake/config/unicode/casefolding/0400_04ff.php                 | 2 +-
 cake/config/unicode/casefolding/0500_052f.php                 | 2 +-
 cake/config/unicode/casefolding/0530_058f.php                 | 2 +-
 cake/config/unicode/casefolding/1e00_1eff.php                 | 2 +-
 cake/config/unicode/casefolding/1f00_1fff.php                 | 2 +-
 cake/config/unicode/casefolding/2100_214f.php                 | 2 +-
 cake/config/unicode/casefolding/2150_218f.php                 | 2 +-
 cake/config/unicode/casefolding/2460_24ff.php                 | 2 +-
 cake/config/unicode/casefolding/2c00_2c5f.php                 | 2 +-
 cake/config/unicode/casefolding/2c60_2c7f.php                 | 2 +-
 cake/config/unicode/casefolding/2c80_2cff.php                 | 2 +-
 cake/config/unicode/casefolding/ff00_ffef.php                 | 2 +-
 cake/console/cake                                             | 2 +-
 cake/console/cake.bat                                         | 2 +-
 cake/console/cake.php                                         | 2 +-
 cake/console/error.php                                        | 2 +-
 cake/console/libs/acl.php                                     | 2 +-
 cake/console/libs/api.php                                     | 2 +-
 cake/console/libs/bake.php                                    | 2 +-
 cake/console/libs/console.php                                 | 2 +-
 cake/console/libs/i18n.php                                    | 2 +-
 cake/console/libs/schema.php                                  | 2 +-
 cake/console/libs/shell.php                                   | 2 +-
 cake/console/libs/tasks/controller.php                        | 2 +-
 cake/console/libs/tasks/db_config.php                         | 2 +-
 cake/console/libs/tasks/extract.php                           | 2 +-
 cake/console/libs/tasks/model.php                             | 2 +-
 cake/console/libs/tasks/plugin.php                            | 2 +-
 cake/console/libs/tasks/project.php                           | 2 +-
 cake/console/libs/tasks/test.php                              | 2 +-
 cake/console/libs/tasks/view.php                              | 2 +-
 cake/console/libs/templates/skel/app_controller.php           | 2 +-
 cake/console/libs/templates/skel/app_helper.php               | 2 +-
 cake/console/libs/templates/skel/app_model.php                | 2 +-
 cake/console/libs/templates/skel/config/bootstrap.php         | 2 +-
 cake/console/libs/templates/skel/config/core.php              | 2 +-
 cake/console/libs/templates/skel/config/database.php.default  | 2 +-
 cake/console/libs/templates/skel/config/inflections.php       | 2 +-
 cake/console/libs/templates/skel/config/routes.php            | 2 +-
 cake/console/libs/templates/skel/config/sql/db_acl.php        | 2 +-
 cake/console/libs/templates/skel/config/sql/i18n.php          | 2 +-
 cake/console/libs/templates/skel/config/sql/sessions.php      | 2 +-
 .../libs/templates/skel/controllers/pages_controller.php      | 2 +-
 cake/console/libs/templates/skel/index.php                    | 2 +-
 .../libs/templates/skel/views/elements/email/html/default.ctp | 2 +-
 .../libs/templates/skel/views/elements/email/text/default.ctp | 2 +-
 cake/console/libs/templates/skel/views/layouts/ajax.ctp       | 2 +-
 cake/console/libs/templates/skel/views/layouts/default.ctp    | 2 +-
 .../libs/templates/skel/views/layouts/email/html/default.ctp  | 2 +-
 .../libs/templates/skel/views/layouts/email/text/default.ctp  | 2 +-
 cake/console/libs/templates/skel/views/layouts/flash.ctp      | 2 +-
 cake/console/libs/templates/skel/webroot/css.php              | 2 +-
 cake/console/libs/templates/skel/webroot/css/cake.generic.css | 2 +-
 cake/console/libs/templates/skel/webroot/index.php            | 2 +-
 cake/console/libs/templates/skel/webroot/js/vendors.php       | 2 +-
 cake/console/libs/templates/views/form.ctp                    | 2 +-
 cake/console/libs/templates/views/index.ctp                   | 2 +-
 cake/console/libs/templates/views/view.ctp                    | 2 +-
 cake/dispatcher.php                                           | 2 +-
 cake/libs/cache.php                                           | 2 +-
 cake/libs/cache/apc.php                                       | 2 +-
 cake/libs/cache/file.php                                      | 2 +-
 cake/libs/cache/memcache.php                                  | 2 +-
 cake/libs/cache/xcache.php                                    | 2 +-
 cake/libs/cake_log.php                                        | 2 +-
 cake/libs/class_registry.php                                  | 2 +-
 cake/libs/configure.php                                       | 2 +-
 cake/libs/controller/app_controller.php                       | 2 +-
 cake/libs/controller/component.php                            | 2 +-
 cake/libs/controller/components/acl.php                       | 2 +-
 cake/libs/controller/components/auth.php                      | 2 +-
 cake/libs/controller/components/cookie.php                    | 2 +-
 cake/libs/controller/components/email.php                     | 2 +-
 cake/libs/controller/components/request_handler.php           | 2 +-
 cake/libs/controller/components/security.php                  | 2 +-
 cake/libs/controller/components/session.php                   | 2 +-
 cake/libs/controller/controller.php                           | 2 +-
 cake/libs/controller/pages_controller.php                     | 2 +-
 cake/libs/controller/scaffold.php                             | 2 +-
 cake/libs/debugger.php                                        | 2 +-
 cake/libs/error.php                                           | 2 +-
 cake/libs/file.php                                            | 2 +-
 cake/libs/flay.php                                            | 2 +-
 cake/libs/folder.php                                          | 2 +-
 cake/libs/http_socket.php                                     | 2 +-
 cake/libs/i18n.php                                            | 2 +-
 cake/libs/inflector.php                                       | 2 +-
 cake/libs/l10n.php                                            | 2 +-
 cake/libs/magic_db.php                                        | 2 +-
 cake/libs/model/app_model.php                                 | 2 +-
 cake/libs/model/behavior.php                                  | 2 +-
 cake/libs/model/behaviors/acl.php                             | 2 +-
 cake/libs/model/behaviors/containable.php                     | 2 +-
 cake/libs/model/behaviors/translate.php                       | 2 +-
 cake/libs/model/behaviors/tree.php                            | 2 +-
 cake/libs/model/connection_manager.php                        | 2 +-
 cake/libs/model/datasources/datasource.php                    | 2 +-
 cake/libs/model/datasources/dbo/dbo_adodb.php                 | 2 +-
 cake/libs/model/datasources/dbo/dbo_db2.php                   | 2 +-
 cake/libs/model/datasources/dbo/dbo_firebird.php              | 2 +-
 cake/libs/model/datasources/dbo/dbo_mssql.php                 | 2 +-
 cake/libs/model/datasources/dbo/dbo_mysql.php                 | 2 +-
 cake/libs/model/datasources/dbo/dbo_mysqli.php                | 2 +-
 cake/libs/model/datasources/dbo/dbo_odbc.php                  | 2 +-
 cake/libs/model/datasources/dbo/dbo_oracle.php                | 2 +-
 cake/libs/model/datasources/dbo/dbo_postgres.php              | 2 +-
 cake/libs/model/datasources/dbo/dbo_sqlite.php                | 2 +-
 cake/libs/model/datasources/dbo/dbo_sybase.php                | 2 +-
 cake/libs/model/datasources/dbo_source.php                    | 2 +-
 cake/libs/model/db_acl.php                                    | 2 +-
 cake/libs/model/model.php                                     | 2 +-
 cake/libs/model/schema.php                                    | 2 +-
 cake/libs/multibyte.php                                       | 2 +-
 cake/libs/object.php                                          | 2 +-
 cake/libs/overloadable.php                                    | 2 +-
 cake/libs/overloadable_php4.php                               | 2 +-
 cake/libs/overloadable_php5.php                               | 2 +-
 cake/libs/router.php                                          | 2 +-
 cake/libs/sanitize.php                                        | 2 +-
 cake/libs/security.php                                        | 2 +-
 cake/libs/session.php                                         | 2 +-
 cake/libs/set.php                                             | 2 +-
 cake/libs/socket.php                                          | 2 +-
 cake/libs/string.php                                          | 2 +-
 cake/libs/validation.php                                      | 2 +-
 cake/libs/view/elements/dump.ctp                              | 2 +-
 cake/libs/view/elements/email/html/default.ctp                | 2 +-
 cake/libs/view/elements/email/text/default.ctp                | 2 +-
 cake/libs/view/errors/error404.ctp                            | 2 +-
 cake/libs/view/errors/missing_action.ctp                      | 2 +-
 cake/libs/view/errors/missing_component_class.ctp             | 2 +-
 cake/libs/view/errors/missing_component_file.ctp              | 2 +-
 cake/libs/view/errors/missing_connection.ctp                  | 2 +-
 cake/libs/view/errors/missing_controller.ctp                  | 2 +-
 cake/libs/view/errors/missing_helper_class.ctp                | 2 +-
 cake/libs/view/errors/missing_helper_file.ctp                 | 2 +-
 cake/libs/view/errors/missing_layout.ctp                      | 2 +-
 cake/libs/view/errors/missing_model.ctp                       | 2 +-
 cake/libs/view/errors/missing_scaffolddb.ctp                  | 2 +-
 cake/libs/view/errors/missing_table.ctp                       | 2 +-
 cake/libs/view/errors/missing_view.ctp                        | 2 +-
 cake/libs/view/errors/private_action.ctp                      | 2 +-
 cake/libs/view/errors/scaffold_error.ctp                      | 2 +-
 cake/libs/view/helper.php                                     | 2 +-
 cake/libs/view/helpers/ajax.php                               | 2 +-
 cake/libs/view/helpers/app_helper.php                         | 2 +-
 cake/libs/view/helpers/cache.php                              | 2 +-
 cake/libs/view/helpers/form.php                               | 2 +-
 cake/libs/view/helpers/html.php                               | 2 +-
 cake/libs/view/helpers/javascript.php                         | 2 +-
 cake/libs/view/helpers/js.php                                 | 2 +-
 cake/libs/view/helpers/number.php                             | 2 +-
 cake/libs/view/helpers/paginator.php                          | 2 +-
 cake/libs/view/helpers/rss.php                                | 2 +-
 cake/libs/view/helpers/session.php                            | 2 +-
 cake/libs/view/helpers/text.php                               | 2 +-
 cake/libs/view/helpers/time.php                               | 2 +-
 cake/libs/view/helpers/xml.php                                | 2 +-
 cake/libs/view/layouts/ajax.ctp                               | 2 +-
 cake/libs/view/layouts/default.ctp                            | 2 +-
 cake/libs/view/layouts/email/html/default.ctp                 | 2 +-
 cake/libs/view/layouts/email/text/default.ctp                 | 2 +-
 cake/libs/view/layouts/flash.ctp                              | 2 +-
 cake/libs/view/media.php                                      | 2 +-
 cake/libs/view/pages/home.ctp                                 | 2 +-
 cake/libs/view/scaffolds/edit.ctp                             | 2 +-
 cake/libs/view/scaffolds/index.ctp                            | 2 +-
 cake/libs/view/scaffolds/view.ctp                             | 2 +-
 cake/libs/view/theme.php                                      | 2 +-
 cake/libs/view/view.php                                       | 2 +-
 cake/libs/xml.php                                             | 2 +-
 cake/tests/cases/console/libs/acl.test.php                    | 2 +-
 cake/tests/cases/console/libs/api.test.php                    | 2 +-
 cake/tests/cases/console/libs/schema.test.php                 | 2 +-
 cake/tests/cases/console/libs/shell.test.php                  | 2 +-
 cake/tests/cases/console/libs/tasks/extract.test.php          | 2 +-
 cake/tests/cases/console/libs/tasks/model.test.php            | 2 +-
 cake/tests/cases/console/libs/tasks/test.test.php             | 2 +-
 cake/tests/cases/libs/cake_test_case.test.php                 | 2 +-
 cake/tests/cases/libs/magic_db.test.php                       | 2 +-
 cake/tests/cases/libs/model/behavior.test.php                 | 4 ++--
 cake/tests/cases/libs/model/behaviors/acl.test.php            | 2 +-
 .../tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php | 2 +-
 .../tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php | 2 +-
 .../tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php | 2 +-
 .../cases/libs/model/datasources/dbo/dbo_mysqli.test.php      | 2 +-
 .../cases/libs/model/datasources/dbo/dbo_oracle.test.php      | 2 +-
 .../cases/libs/model/datasources/dbo/dbo_postgres.test.php    | 2 +-
 .../cases/libs/model/datasources/dbo/dbo_sqlite.test.php      | 2 +-
 cake/tests/fixtures/ad_fixture.php                            | 4 ++--
 cake/tests/fixtures/after_tree_fixture.php                    | 4 ++--
 cake/tests/fixtures/campaign_fixture.php                      | 4 ++--
 cake/tests/fixtures/datatype_fixture.php                      | 2 +-
 cake/tests/fixtures/dependency_fixture.php                    | 2 +-
 cake/tests/fixtures/node_fixture.php                          | 2 +-
 cake/tests/test_app/config/acl.ini.php                        | 2 +-
 .../test_app/models/behaviors/persister_one_behavior.php      | 2 +-
 .../test_app/models/behaviors/persister_two_behavior.php      | 2 +-
 cake/tests/test_app/models/comment.php                        | 2 +-
 cake/tests/test_app/models/persister_one.php                  | 2 +-
 cake/tests/test_app/models/persister_two.php                  | 2 +-
 cake/tests/test_app/models/post.php                           | 2 +-
 .../models/behaviors/test_plugin_persister_one.php            | 2 +-
 .../models/behaviors/test_plugin_persister_two.php            | 2 +-
 .../plugins/test_plugin/models/test_plugin_authors.php        | 2 +-
 .../plugins/test_plugin/models/test_plugin_comment.php        | 2 +-
 .../test_app/plugins/test_plugin/models/test_plugin_post.php  | 2 +-
 cake/tests/test_app/views/elements/email/html/default.ctp     | 2 +-
 cake/tests/test_app/views/elements/email/text/default.ctp     | 2 +-
 cake/tests/test_app/views/elements/email/text/wide.ctp        | 2 +-
 cake/tests/test_app/views/layouts/ajax.ctp                    | 2 +-
 cake/tests/test_app/views/layouts/ajax2.ctp                   | 2 +-
 cake/tests/test_app/views/layouts/cache_layout.ctp            | 2 +-
 cake/tests/test_app/views/layouts/default.ctp                 | 2 +-
 cake/tests/test_app/views/layouts/email/html/default.ctp      | 2 +-
 cake/tests/test_app/views/layouts/email/html/thin.ctp         | 2 +-
 cake/tests/test_app/views/layouts/email/text/default.ctp      | 2 +-
 cake/tests/test_app/views/layouts/flash.ctp                   | 2 +-
 cake/tests/test_app/views/layouts/multi_cache.ctp             | 2 +-
 cake/tests/test_app/views/posts/sequencial_nocache.ctp        | 2 +-
 cake/tests/test_app/views/posts/test_nocache_tags.ctp         | 2 +-
 index.php                                                     | 2 +-
 246 files changed, 250 insertions(+), 250 deletions(-)

diff --git a/app/config/acl.ini.php b/app/config/acl.ini.php
index a6e9c97fb..924a949a8 100644
--- a/app/config/acl.ini.php
+++ b/app/config/acl.ini.php
@@ -6,7 +6,7 @@
 ; *
 ; * PHP versions 4 and 5
 ; *
-; * CakePHP(tm) :  Rapid Development Framework http://www.cakephp.org/
+; * CakePHP(tm) :  Rapid Development Framework http://cakephp.org
 ; * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
 ; *
 ; *  Licensed under The MIT License
diff --git a/app/config/bootstrap.php b/app/config/bootstrap.php
index 22bd4a938..c0ff386a5 100644
--- a/app/config/bootstrap.php
+++ b/app/config/bootstrap.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/app/config/core.php b/app/config/core.php
index 283eba4d1..8e0a6c556 100644
--- a/app/config/core.php
+++ b/app/config/core.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/app/config/database.php.default b/app/config/database.php.default
index c30e368ae..fb731bce5 100644
--- a/app/config/database.php.default
+++ b/app/config/database.php.default
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/app/config/inflections.php b/app/config/inflections.php
index 2c73fd884..db309bd1f 100644
--- a/app/config/inflections.php
+++ b/app/config/inflections.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and %
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/app/config/routes.php b/app/config/routes.php
index 32094aa62..2858312c4 100644
--- a/app/config/routes.php
+++ b/app/config/routes.php
@@ -9,7 +9,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/app/config/sql/db_acl.php b/app/config/sql/db_acl.php
index 72530d65c..0c874eb4d 100644
--- a/app/config/sql/db_acl.php
+++ b/app/config/sql/db_acl.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/app/config/sql/i18n.php b/app/config/sql/i18n.php
index ac0e7f5a9..ec37040b1 100644
--- a/app/config/sql/i18n.php
+++ b/app/config/sql/i18n.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/app/config/sql/sessions.php b/app/config/sql/sessions.php
index 8880e49b5..068a8f106 100644
--- a/app/config/sql/sessions.php
+++ b/app/config/sql/sessions.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/app/index.php b/app/index.php
index a8cca5d89..bb7acbc0e 100644
--- a/app/index.php
+++ b/app/index.php
@@ -3,7 +3,7 @@
 /**
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/app/webroot/css.php b/app/webroot/css.php
index bb29d0362..0c78a5b98 100644
--- a/app/webroot/css.php
+++ b/app/webroot/css.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/app/webroot/css/cake.generic.css b/app/webroot/css/cake.generic.css
index 3c244c5ba..a5dee0374 100644
--- a/app/webroot/css/cake.generic.css
+++ b/app/webroot/css/cake.generic.css
@@ -3,7 +3,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/app/webroot/index.php b/app/webroot/index.php
index 8608f07dd..4f4250ee1 100644
--- a/app/webroot/index.php
+++ b/app/webroot/index.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/app/webroot/js/vendors.php b/app/webroot/js/vendors.php
index d9d38f690..0e4890eb1 100644
--- a/app/webroot/js/vendors.php
+++ b/app/webroot/js/vendors.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/LICENSE.txt b/cake/LICENSE.txt
index d699c53c7..bf6f82dd4 100644
--- a/cake/LICENSE.txt
+++ b/cake/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-CakePHP(tm) : The Rapid Development PHP Framework (http://www.cakephp.org)
+CakePHP(tm) : The Rapid Development PHP Framework (http://cakephp.org)
 Copyright 2005-2010, Cake Software Foundation, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/cake/basics.php b/cake/basics.php
index 19cfc5bbb..8a35e00b3 100644
--- a/cake/basics.php
+++ b/cake/basics.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/bootstrap.php b/cake/bootstrap.php
index 473530fd6..9b2d2877e 100644
--- a/cake/bootstrap.php
+++ b/cake/bootstrap.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/config.php b/cake/config/config.php
index ce1b9ba83..ee189ca96 100644
--- a/cake/config/config.php
+++ b/cake/config/config.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/paths.php b/cake/config/paths.php
index 781ce0ce9..232fef6c0 100644
--- a/cake/config/paths.php
+++ b/cake/config/paths.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/0080_00ff.php b/cake/config/unicode/casefolding/0080_00ff.php
index a3917c776..9fe621991 100644
--- a/cake/config/unicode/casefolding/0080_00ff.php
+++ b/cake/config/unicode/casefolding/0080_00ff.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/0100_017f.php b/cake/config/unicode/casefolding/0100_017f.php
index e3df9f639..734041445 100644
--- a/cake/config/unicode/casefolding/0100_017f.php
+++ b/cake/config/unicode/casefolding/0100_017f.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/0180_024F.php b/cake/config/unicode/casefolding/0180_024F.php
index 73fb18d7d..f75336049 100644
--- a/cake/config/unicode/casefolding/0180_024F.php
+++ b/cake/config/unicode/casefolding/0180_024F.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/0250_02af.php b/cake/config/unicode/casefolding/0250_02af.php
index df1b95321..ef4adedd8 100644
--- a/cake/config/unicode/casefolding/0250_02af.php
+++ b/cake/config/unicode/casefolding/0250_02af.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/0370_03ff.php b/cake/config/unicode/casefolding/0370_03ff.php
index aff493514..38fb80b82 100644
--- a/cake/config/unicode/casefolding/0370_03ff.php
+++ b/cake/config/unicode/casefolding/0370_03ff.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/0400_04ff.php b/cake/config/unicode/casefolding/0400_04ff.php
index 4b789a8ae..0e5cb041f 100644
--- a/cake/config/unicode/casefolding/0400_04ff.php
+++ b/cake/config/unicode/casefolding/0400_04ff.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/0500_052f.php b/cake/config/unicode/casefolding/0500_052f.php
index 6747ce752..04a47eac3 100644
--- a/cake/config/unicode/casefolding/0500_052f.php
+++ b/cake/config/unicode/casefolding/0500_052f.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/0530_058f.php b/cake/config/unicode/casefolding/0530_058f.php
index 68f3c6562..0d3e4bf6a 100644
--- a/cake/config/unicode/casefolding/0530_058f.php
+++ b/cake/config/unicode/casefolding/0530_058f.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/1e00_1eff.php b/cake/config/unicode/casefolding/1e00_1eff.php
index 12f58212a..008d9a170 100644
--- a/cake/config/unicode/casefolding/1e00_1eff.php
+++ b/cake/config/unicode/casefolding/1e00_1eff.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/1f00_1fff.php b/cake/config/unicode/casefolding/1f00_1fff.php
index 59a451ae0..7ed195305 100644
--- a/cake/config/unicode/casefolding/1f00_1fff.php
+++ b/cake/config/unicode/casefolding/1f00_1fff.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/2100_214f.php b/cake/config/unicode/casefolding/2100_214f.php
index c39d3ff2d..5571cec8d 100644
--- a/cake/config/unicode/casefolding/2100_214f.php
+++ b/cake/config/unicode/casefolding/2100_214f.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/2150_218f.php b/cake/config/unicode/casefolding/2150_218f.php
index 0cc85d0ee..33584d3c3 100644
--- a/cake/config/unicode/casefolding/2150_218f.php
+++ b/cake/config/unicode/casefolding/2150_218f.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/2460_24ff.php b/cake/config/unicode/casefolding/2460_24ff.php
index ff9508812..3ae117f31 100644
--- a/cake/config/unicode/casefolding/2460_24ff.php
+++ b/cake/config/unicode/casefolding/2460_24ff.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/2c00_2c5f.php b/cake/config/unicode/casefolding/2c00_2c5f.php
index f7c97b85d..1dcafa5b3 100644
--- a/cake/config/unicode/casefolding/2c00_2c5f.php
+++ b/cake/config/unicode/casefolding/2c00_2c5f.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/2c60_2c7f.php b/cake/config/unicode/casefolding/2c60_2c7f.php
index ca1d527eb..c21ce14cb 100644
--- a/cake/config/unicode/casefolding/2c60_2c7f.php
+++ b/cake/config/unicode/casefolding/2c60_2c7f.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/2c80_2cff.php b/cake/config/unicode/casefolding/2c80_2cff.php
index bad418bcb..2aa0343b6 100644
--- a/cake/config/unicode/casefolding/2c80_2cff.php
+++ b/cake/config/unicode/casefolding/2c80_2cff.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/config/unicode/casefolding/ff00_ffef.php b/cake/config/unicode/casefolding/ff00_ffef.php
index f4facbe76..0be09c9a4 100644
--- a/cake/config/unicode/casefolding/ff00_ffef.php
+++ b/cake/config/unicode/casefolding/ff00_ffef.php
@@ -11,7 +11,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/cake b/cake/console/cake
index 890457ba6..632133897 100755
--- a/cake/console/cake
+++ b/cake/console/cake
@@ -4,7 +4,7 @@
 # Bake is a shell script for running CakePHP bake script
 # PHP versions 4 and 5
 #
-# CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+# CakePHP(tm) :  Rapid Development Framework (http://cakephp.org)
 # Copyright 2005-2010, Cake Software Foundation, Inc.
 #
 # Licensed under The MIT License
diff --git a/cake/console/cake.bat b/cake/console/cake.bat
index 09701dea7..cac0a3a63 100644
--- a/cake/console/cake.bat
+++ b/cake/console/cake.bat
@@ -3,7 +3,7 @@
 :: Bake is a shell script for running CakePHP bake script
 :: PHP versions 4 and 5
 ::
-:: CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+:: CakePHP(tm) :  Rapid Development Framework (http://cakephp.org)
 :: Copyright 2005-2010, Cake Software Foundation, Inc.
 ::
 :: Licensed under The MIT License
diff --git a/cake/console/cake.php b/cake/console/cake.php
index 517437069..b5942fdd0 100644
--- a/cake/console/cake.php
+++ b/cake/console/cake.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010,	Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/console/error.php b/cake/console/error.php
index 1eebc436f..de9a2fb5a 100644
--- a/cake/console/error.php
+++ b/cake/console/error.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/acl.php b/cake/console/libs/acl.php
index 74d4895ff..0e4d0f831 100644
--- a/cake/console/libs/acl.php
+++ b/cake/console/libs/acl.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/api.php b/cake/console/libs/api.php
index 593e90d84..7721545b9 100644
--- a/cake/console/libs/api.php
+++ b/cake/console/libs/api.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/bake.php b/cake/console/libs/bake.php
index cf20acff0..646fecbbf 100644
--- a/cake/console/libs/bake.php
+++ b/cake/console/libs/bake.php
@@ -9,7 +9,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/console.php b/cake/console/libs/console.php
index 56f90c23f..601c347f5 100644
--- a/cake/console/libs/console.php
+++ b/cake/console/libs/console.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/i18n.php b/cake/console/libs/i18n.php
index 875c63ff5..ca731d9cc 100644
--- a/cake/console/libs/i18n.php
+++ b/cake/console/libs/i18n.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/schema.php b/cake/console/libs/schema.php
index 1c643fa98..033c683b1 100644
--- a/cake/console/libs/schema.php
+++ b/cake/console/libs/schema.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php
index 4e477f1af..b09cc42e7 100644
--- a/cake/console/libs/shell.php
+++ b/cake/console/libs/shell.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index 404f5cacd..9031f6c5c 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010,	Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/tasks/db_config.php b/cake/console/libs/tasks/db_config.php
index a19eb6114..3780f6d85 100644
--- a/cake/console/libs/tasks/db_config.php
+++ b/cake/console/libs/tasks/db_config.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/tasks/extract.php b/cake/console/libs/tasks/extract.php
index b93f29320..2e5b9d01c 100644
--- a/cake/console/libs/tasks/extract.php
+++ b/cake/console/libs/tasks/extract.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index 13c321be8..2ece02e16 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/tasks/plugin.php b/cake/console/libs/tasks/plugin.php
index 4cf68d802..70287cb1c 100644
--- a/cake/console/libs/tasks/plugin.php
+++ b/cake/console/libs/tasks/plugin.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php
index d6a3a547b..237405346 100644
--- a/cake/console/libs/tasks/project.php
+++ b/cake/console/libs/tasks/project.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php
index 26d056a70..2b187eecb 100644
--- a/cake/console/libs/tasks/test.php
+++ b/cake/console/libs/tasks/test.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php
index 14b8029be..0f4d8a410 100644
--- a/cake/console/libs/tasks/view.php
+++ b/cake/console/libs/tasks/view.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/app_controller.php b/cake/console/libs/templates/skel/app_controller.php
index d88316a2b..078966d97 100644
--- a/cake/console/libs/templates/skel/app_controller.php
+++ b/cake/console/libs/templates/skel/app_controller.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/app_helper.php b/cake/console/libs/templates/skel/app_helper.php
index b5c962f8f..0fa824c1d 100644
--- a/cake/console/libs/templates/skel/app_helper.php
+++ b/cake/console/libs/templates/skel/app_helper.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/app_model.php b/cake/console/libs/templates/skel/app_model.php
index bb6b950b5..ac03cf684 100644
--- a/cake/console/libs/templates/skel/app_model.php
+++ b/cake/console/libs/templates/skel/app_model.php
@@ -9,7 +9,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/config/bootstrap.php b/cake/console/libs/templates/skel/config/bootstrap.php
index 22bd4a938..c0ff386a5 100644
--- a/cake/console/libs/templates/skel/config/bootstrap.php
+++ b/cake/console/libs/templates/skel/config/bootstrap.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/config/core.php b/cake/console/libs/templates/skel/config/core.php
index a8bc5b9ee..3f997fd11 100644
--- a/cake/console/libs/templates/skel/config/core.php
+++ b/cake/console/libs/templates/skel/config/core.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/config/database.php.default b/cake/console/libs/templates/skel/config/database.php.default
index c30e368ae..fb731bce5 100644
--- a/cake/console/libs/templates/skel/config/database.php.default
+++ b/cake/console/libs/templates/skel/config/database.php.default
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/config/inflections.php b/cake/console/libs/templates/skel/config/inflections.php
index fe45e4d2f..0baa65a26 100644
--- a/cake/console/libs/templates/skel/config/inflections.php
+++ b/cake/console/libs/templates/skel/config/inflections.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and %
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/config/routes.php b/cake/console/libs/templates/skel/config/routes.php
index 32094aa62..2858312c4 100644
--- a/cake/console/libs/templates/skel/config/routes.php
+++ b/cake/console/libs/templates/skel/config/routes.php
@@ -9,7 +9,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/config/sql/db_acl.php b/cake/console/libs/templates/skel/config/sql/db_acl.php
index 72530d65c..0c874eb4d 100644
--- a/cake/console/libs/templates/skel/config/sql/db_acl.php
+++ b/cake/console/libs/templates/skel/config/sql/db_acl.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/config/sql/i18n.php b/cake/console/libs/templates/skel/config/sql/i18n.php
index ac0e7f5a9..ec37040b1 100644
--- a/cake/console/libs/templates/skel/config/sql/i18n.php
+++ b/cake/console/libs/templates/skel/config/sql/i18n.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/config/sql/sessions.php b/cake/console/libs/templates/skel/config/sql/sessions.php
index 8880e49b5..068a8f106 100644
--- a/cake/console/libs/templates/skel/config/sql/sessions.php
+++ b/cake/console/libs/templates/skel/config/sql/sessions.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/controllers/pages_controller.php b/cake/console/libs/templates/skel/controllers/pages_controller.php
index 4001408c0..23a172264 100644
--- a/cake/console/libs/templates/skel/controllers/pages_controller.php
+++ b/cake/console/libs/templates/skel/controllers/pages_controller.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/index.php b/cake/console/libs/templates/skel/index.php
index a8cca5d89..bb7acbc0e 100644
--- a/cake/console/libs/templates/skel/index.php
+++ b/cake/console/libs/templates/skel/index.php
@@ -3,7 +3,7 @@
 /**
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/views/elements/email/html/default.ctp b/cake/console/libs/templates/skel/views/elements/email/html/default.ctp
index b7c906233..0727c586e 100644
--- a/cake/console/libs/templates/skel/views/elements/email/html/default.ctp
+++ b/cake/console/libs/templates/skel/views/elements/email/html/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/views/elements/email/text/default.ctp b/cake/console/libs/templates/skel/views/elements/email/text/default.ctp
index d3f885b5c..f4dbc133d 100644
--- a/cake/console/libs/templates/skel/views/elements/email/text/default.ctp
+++ b/cake/console/libs/templates/skel/views/elements/email/text/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/views/layouts/ajax.ctp b/cake/console/libs/templates/skel/views/layouts/ajax.ctp
index a3440dd2c..94d922b5f 100644
--- a/cake/console/libs/templates/skel/views/layouts/ajax.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/ajax.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/views/layouts/default.ctp b/cake/console/libs/templates/skel/views/layouts/default.ctp
index f9b1423ab..5096fcff0 100644
--- a/cake/console/libs/templates/skel/views/layouts/default.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp b/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
index dbf7916be..e68167aea 100644
--- a/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp b/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
index aeef64f2b..262938d63 100644
--- a/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/views/layouts/flash.ctp b/cake/console/libs/templates/skel/views/layouts/flash.ctp
index 9ec3209f4..f96285cee 100644
--- a/cake/console/libs/templates/skel/views/layouts/flash.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/flash.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/webroot/css.php b/cake/console/libs/templates/skel/webroot/css.php
index b95cb8a36..86c16392d 100644
--- a/cake/console/libs/templates/skel/webroot/css.php
+++ b/cake/console/libs/templates/skel/webroot/css.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/webroot/css/cake.generic.css b/cake/console/libs/templates/skel/webroot/css/cake.generic.css
index 6769c99ca..21bbdcdd0 100644
--- a/cake/console/libs/templates/skel/webroot/css/cake.generic.css
+++ b/cake/console/libs/templates/skel/webroot/css/cake.generic.css
@@ -3,7 +3,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/webroot/index.php b/cake/console/libs/templates/skel/webroot/index.php
index 798b026f5..59027fa96 100644
--- a/cake/console/libs/templates/skel/webroot/index.php
+++ b/cake/console/libs/templates/skel/webroot/index.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/skel/webroot/js/vendors.php b/cake/console/libs/templates/skel/webroot/js/vendors.php
index d9d38f690..0e4890eb1 100644
--- a/cake/console/libs/templates/skel/webroot/js/vendors.php
+++ b/cake/console/libs/templates/skel/webroot/js/vendors.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/views/form.ctp b/cake/console/libs/templates/views/form.ctp
index 91c9f77db..7094fbb65 100644
--- a/cake/console/libs/templates/views/form.ctp
+++ b/cake/console/libs/templates/views/form.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/views/index.ctp b/cake/console/libs/templates/views/index.ctp
index 13de4923b..0cc11cb63 100644
--- a/cake/console/libs/templates/views/index.ctp
+++ b/cake/console/libs/templates/views/index.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/console/libs/templates/views/view.ctp b/cake/console/libs/templates/views/view.ctp
index 362d57c89..657627081 100644
--- a/cake/console/libs/templates/views/view.ctp
+++ b/cake/console/libs/templates/views/view.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index 69eb962f5..a073b870a 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index bc93aa9a2..e707137ae 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -6,7 +6,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/cache/apc.php b/cake/libs/cache/apc.php
index ecf8f746c..84871e674 100644
--- a/cake/libs/cache/apc.php
+++ b/cake/libs/cache/apc.php
@@ -6,7 +6,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/cache/file.php b/cake/libs/cache/file.php
index c98ccc6d3..b4c0403f2 100644
--- a/cake/libs/cache/file.php
+++ b/cake/libs/cache/file.php
@@ -6,7 +6,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php
index fb293176d..f2b48956c 100644
--- a/cake/libs/cache/memcache.php
+++ b/cake/libs/cache/memcache.php
@@ -6,7 +6,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/cache/xcache.php b/cake/libs/cache/xcache.php
index f25dbdd2c..6c8643b9b 100644
--- a/cake/libs/cache/xcache.php
+++ b/cake/libs/cache/xcache.php
@@ -6,7 +6,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php
index b0b6404b3..879aaf830 100644
--- a/cake/libs/cake_log.php
+++ b/cake/libs/cake_log.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/class_registry.php b/cake/libs/class_registry.php
index a825e800e..cbfe447b0 100644
--- a/cake/libs/class_registry.php
+++ b/cake/libs/class_registry.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 4d0ed0a2f..b9b9a3ffe 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/controller/app_controller.php b/cake/libs/controller/app_controller.php
index 57d35bada..8ca9bc12c 100644
--- a/cake/libs/controller/app_controller.php
+++ b/cake/libs/controller/app_controller.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php
index 3e740003c..bf5fab8d7 100644
--- a/cake/libs/controller/component.php
+++ b/cake/libs/controller/component.php
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php
index 2d53b3283..711b03f1a 100644
--- a/cake/libs/controller/components/acl.php
+++ b/cake/libs/controller/components/acl.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
index ec1a03051..801385ca7 100644
--- a/cake/libs/controller/components/auth.php
+++ b/cake/libs/controller/components/auth.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php
index 04ac59918..79210b6a0 100644
--- a/cake/libs/controller/components/cookie.php
+++ b/cake/libs/controller/components/cookie.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index 61f6e2ed1..61e49b72c 100644
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php
index 25342941b..c5bc6184e 100644
--- a/cake/libs/controller/components/request_handler.php
+++ b/cake/libs/controller/components/request_handler.php
@@ -7,7 +7,7 @@
  * and the like.  These units have no use for Ajax requests, and this Component can tell how Cake
  * should respond to the different needs of a handheld computer and a desktop machine.
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index 306080d41..f702c194a 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/controller/components/session.php b/cake/libs/controller/components/session.php
index 483ddba31..5300ab6f4 100644
--- a/cake/libs/controller/components/session.php
+++ b/cake/libs/controller/components/session.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 2f12be5d2..16524a986 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/controller/pages_controller.php b/cake/libs/controller/pages_controller.php
index 4001408c0..23a172264 100644
--- a/cake/libs/controller/pages_controller.php
+++ b/cake/libs/controller/pages_controller.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php
index d885e8a2e..fb2b55d11 100644
--- a/cake/libs/controller/scaffold.php
+++ b/cake/libs/controller/scaffold.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php
index a4cd47a7b..5ff17dc9b 100644
--- a/cake/libs/debugger.php
+++ b/cake/libs/debugger.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/error.php b/cake/libs/error.php
index e3c0a3d14..8f33ff37b 100644
--- a/cake/libs/error.php
+++ b/cake/libs/error.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/file.php b/cake/libs/file.php
index fba1f3aa3..334c0da14 100644
--- a/cake/libs/file.php
+++ b/cake/libs/file.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/flay.php b/cake/libs/flay.php
index 1a81930af..1df0a2aba 100644
--- a/cake/libs/flay.php
+++ b/cake/libs/flay.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/folder.php b/cake/libs/folder.php
index bd0ef42cf..05dd150b2 100644
--- a/cake/libs/folder.php
+++ b/cake/libs/folder.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index ccd5aa037..3539afc68 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/i18n.php b/cake/libs/i18n.php
index 8fdb30b15..34f6094c9 100644
--- a/cake/libs/i18n.php
+++ b/cake/libs/i18n.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index 9ce5714d4..4012b1a8d 100644
--- a/cake/libs/inflector.php
+++ b/cake/libs/inflector.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php
index 13a2e9a6b..db82c59da 100644
--- a/cake/libs/l10n.php
+++ b/cake/libs/l10n.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/magic_db.php b/cake/libs/magic_db.php
index a5784441a..9e6a66850 100644
--- a/cake/libs/magic_db.php
+++ b/cake/libs/magic_db.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/app_model.php b/cake/libs/model/app_model.php
index e09b1f970..becea6f5a 100644
--- a/cake/libs/model/app_model.php
+++ b/cake/libs/model/app_model.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/behavior.php b/cake/libs/model/behavior.php
index d91bf0eb3..b9633ae59 100644
--- a/cake/libs/model/behavior.php
+++ b/cake/libs/model/behavior.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/behaviors/acl.php b/cake/libs/model/behaviors/acl.php
index e2c7038c0..86ba27445 100644
--- a/cake/libs/model/behaviors/acl.php
+++ b/cake/libs/model/behaviors/acl.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php
index 221cb8f1e..7aa02f55e 100644
--- a/cake/libs/model/behaviors/containable.php
+++ b/cake/libs/model/behaviors/containable.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/behaviors/translate.php b/cake/libs/model/behaviors/translate.php
index bba76be4d..81c7ac4a9 100644
--- a/cake/libs/model/behaviors/translate.php
+++ b/cake/libs/model/behaviors/translate.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php
index ab1d2ff9c..aaca0994f 100644
--- a/cake/libs/model/behaviors/tree.php
+++ b/cake/libs/model/behaviors/tree.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/connection_manager.php b/cake/libs/model/connection_manager.php
index 581cd3b2d..ce9347439 100644
--- a/cake/libs/model/connection_manager.php
+++ b/cake/libs/model/connection_manager.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php
index e57fbfcd6..bc69839ae 100644
--- a/cake/libs/model/datasources/datasource.php
+++ b/cake/libs/model/datasources/datasource.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/datasources/dbo/dbo_adodb.php b/cake/libs/model/datasources/dbo/dbo_adodb.php
index e089e1f10..1619f0ac9 100644
--- a/cake/libs/model/datasources/dbo/dbo_adodb.php
+++ b/cake/libs/model/datasources/dbo/dbo_adodb.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/datasources/dbo/dbo_db2.php b/cake/libs/model/datasources/dbo/dbo_db2.php
index 0a5600bca..030d4fdd3 100644
--- a/cake/libs/model/datasources/dbo/dbo_db2.php
+++ b/cake/libs/model/datasources/dbo/dbo_db2.php
@@ -9,7 +9,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2007, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/datasources/dbo/dbo_firebird.php b/cake/libs/model/datasources/dbo/dbo_firebird.php
index 06454fef6..5c6e5bd54 100644
--- a/cake/libs/model/datasources/dbo/dbo_firebird.php
+++ b/cake/libs/model/datasources/dbo/dbo_firebird.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index dadf67660..9b2912bfd 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index 190d96aa1..f888a7a8c 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index d7e991476..174977e5c 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/datasources/dbo/dbo_odbc.php b/cake/libs/model/datasources/dbo/dbo_odbc.php
index d35f5e7a8..89d872e6f 100644
--- a/cake/libs/model/datasources/dbo/dbo_odbc.php
+++ b/cake/libs/model/datasources/dbo/dbo_odbc.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
index db6a1586c..f222bdf23 100644
--- a/cake/libs/model/datasources/dbo/dbo_oracle.php
+++ b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index 959a23826..ede59a231 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index 3b13e7980..4e106da9b 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/datasources/dbo/dbo_sybase.php b/cake/libs/model/datasources/dbo/dbo_sybase.php
index 21c87b62b..23cde4993 100644
--- a/cake/libs/model/datasources/dbo/dbo_sybase.php
+++ b/cake/libs/model/datasources/dbo/dbo_sybase.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 94c060cc7..5fd829efb 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/db_acl.php b/cake/libs/model/db_acl.php
index 49b3d04fb..fddbc60c8 100644
--- a/cake/libs/model/db_acl.php
+++ b/cake/libs/model/db_acl.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 158ee86ea..d3d2696d0 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/model/schema.php b/cake/libs/model/schema.php
index 7457968af..30c1a37da 100644
--- a/cake/libs/model/schema.php
+++ b/cake/libs/model/schema.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/multibyte.php b/cake/libs/multibyte.php
index 069136ccc..f77617dbf 100644
--- a/cake/libs/multibyte.php
+++ b/cake/libs/multibyte.php
@@ -6,7 +6,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/object.php b/cake/libs/object.php
index 0b83127e6..e6790d817 100644
--- a/cake/libs/object.php
+++ b/cake/libs/object.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/overloadable.php b/cake/libs/overloadable.php
index 2714ae81c..6962f6ebd 100644
--- a/cake/libs/overloadable.php
+++ b/cake/libs/overloadable.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/overloadable_php4.php b/cake/libs/overloadable_php4.php
index e4977bc16..b61a5f3fa 100644
--- a/cake/libs/overloadable_php4.php
+++ b/cake/libs/overloadable_php4.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/overloadable_php5.php b/cake/libs/overloadable_php5.php
index 27aadff1a..471d32c95 100644
--- a/cake/libs/overloadable_php5.php
+++ b/cake/libs/overloadable_php5.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/router.php b/cake/libs/router.php
index c3fca15ce..51d452cec 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/sanitize.php b/cake/libs/sanitize.php
index 45a8b5689..c36d39853 100644
--- a/cake/libs/sanitize.php
+++ b/cake/libs/sanitize.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/security.php b/cake/libs/security.php
index 4dba07c55..bcd68ad30 100644
--- a/cake/libs/security.php
+++ b/cake/libs/security.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/session.php b/cake/libs/session.php
index b3ba09e7a..8dbbdb78a 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -10,7 +10,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/set.php b/cake/libs/set.php
index f6b13a9b4..fc921b26a 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/socket.php b/cake/libs/socket.php
index 1ec8bf4b3..bbdd29e2f 100644
--- a/cake/libs/socket.php
+++ b/cake/libs/socket.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/string.php b/cake/libs/string.php
index 9717896ae..978f3163e 100644
--- a/cake/libs/string.php
+++ b/cake/libs/string.php
@@ -6,7 +6,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index fbe6bdf46..6638f6973 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/elements/dump.ctp b/cake/libs/view/elements/dump.ctp
index 622a531d0..a9205d3c0 100644
--- a/cake/libs/view/elements/dump.ctp
+++ b/cake/libs/view/elements/dump.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/elements/email/html/default.ctp b/cake/libs/view/elements/email/html/default.ctp
index b7c906233..0727c586e 100644
--- a/cake/libs/view/elements/email/html/default.ctp
+++ b/cake/libs/view/elements/email/html/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/elements/email/text/default.ctp b/cake/libs/view/elements/email/text/default.ctp
index d3f885b5c..f4dbc133d 100644
--- a/cake/libs/view/elements/email/text/default.ctp
+++ b/cake/libs/view/elements/email/text/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/error404.ctp b/cake/libs/view/errors/error404.ctp
index b1bc0686d..e5863dd5b 100644
--- a/cake/libs/view/errors/error404.ctp
+++ b/cake/libs/view/errors/error404.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/missing_action.ctp b/cake/libs/view/errors/missing_action.ctp
index 1e9cc196d..0832f9f44 100644
--- a/cake/libs/view/errors/missing_action.ctp
+++ b/cake/libs/view/errors/missing_action.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/missing_component_class.ctp b/cake/libs/view/errors/missing_component_class.ctp
index ce8ff52bb..d873a3079 100644
--- a/cake/libs/view/errors/missing_component_class.ctp
+++ b/cake/libs/view/errors/missing_component_class.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/missing_component_file.ctp b/cake/libs/view/errors/missing_component_file.ctp
index 83520da99..af4daeeb1 100644
--- a/cake/libs/view/errors/missing_component_file.ctp
+++ b/cake/libs/view/errors/missing_component_file.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/missing_connection.ctp b/cake/libs/view/errors/missing_connection.ctp
index 754c2a3d5..2ee6a04ad 100644
--- a/cake/libs/view/errors/missing_connection.ctp
+++ b/cake/libs/view/errors/missing_connection.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/missing_controller.ctp b/cake/libs/view/errors/missing_controller.ctp
index f50b8d6e8..ad4776700 100644
--- a/cake/libs/view/errors/missing_controller.ctp
+++ b/cake/libs/view/errors/missing_controller.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/missing_helper_class.ctp b/cake/libs/view/errors/missing_helper_class.ctp
index ac7877682..252097db7 100644
--- a/cake/libs/view/errors/missing_helper_class.ctp
+++ b/cake/libs/view/errors/missing_helper_class.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/missing_helper_file.ctp b/cake/libs/view/errors/missing_helper_file.ctp
index d5a72f9b8..472abf002 100644
--- a/cake/libs/view/errors/missing_helper_file.ctp
+++ b/cake/libs/view/errors/missing_helper_file.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/missing_layout.ctp b/cake/libs/view/errors/missing_layout.ctp
index febe11d33..5fcb4bb34 100644
--- a/cake/libs/view/errors/missing_layout.ctp
+++ b/cake/libs/view/errors/missing_layout.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/missing_model.ctp b/cake/libs/view/errors/missing_model.ctp
index e7e45c484..fa4161d00 100644
--- a/cake/libs/view/errors/missing_model.ctp
+++ b/cake/libs/view/errors/missing_model.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/missing_scaffolddb.ctp b/cake/libs/view/errors/missing_scaffolddb.ctp
index f6355a850..23545fb37 100644
--- a/cake/libs/view/errors/missing_scaffolddb.ctp
+++ b/cake/libs/view/errors/missing_scaffolddb.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/missing_table.ctp b/cake/libs/view/errors/missing_table.ctp
index a1775a4e5..a31b9254e 100644
--- a/cake/libs/view/errors/missing_table.ctp
+++ b/cake/libs/view/errors/missing_table.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/missing_view.ctp b/cake/libs/view/errors/missing_view.ctp
index 503179f96..3d001c665 100644
--- a/cake/libs/view/errors/missing_view.ctp
+++ b/cake/libs/view/errors/missing_view.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/private_action.ctp b/cake/libs/view/errors/private_action.ctp
index 23beb5052..27ff6c9c1 100644
--- a/cake/libs/view/errors/private_action.ctp
+++ b/cake/libs/view/errors/private_action.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/errors/scaffold_error.ctp b/cake/libs/view/errors/scaffold_error.ctp
index 48b8db4db..fff6870d7 100644
--- a/cake/libs/view/errors/scaffold_error.ctp
+++ b/cake/libs/view/errors/scaffold_error.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
index 2cd51639c..4b69c3318 100644
--- a/cake/libs/view/helper.php
+++ b/cake/libs/view/helper.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php
index 600c93327..c393e3fb5 100644
--- a/cake/libs/view/helpers/ajax.php
+++ b/cake/libs/view/helpers/ajax.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helpers/app_helper.php b/cake/libs/view/helpers/app_helper.php
index b5c962f8f..0fa824c1d 100644
--- a/cake/libs/view/helpers/app_helper.php
+++ b/cake/libs/view/helpers/app_helper.php
@@ -8,7 +8,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php
index f3043ba2a..045a22e74 100644
--- a/cake/libs/view/helpers/cache.php
+++ b/cake/libs/view/helpers/cache.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index fc90a5a6c..bec46c6b9 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index 446188650..de68c6861 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -5,7 +5,7 @@
  *
  * Simplifies the construction of HTML elements.
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index aacfd4e0e..3e07ef9bd 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
index 8cc82c9fa..fcf10cce8 100644
--- a/cake/libs/view/helpers/js.php
+++ b/cake/libs/view/helpers/js.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php
index 69b7e1130..55fdf3c1f 100644
--- a/cake/libs/view/helpers/number.php
+++ b/cake/libs/view/helpers/number.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index d00477853..87eaf227c 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -5,7 +5,7 @@
  *
  * Generates pagination links
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helpers/rss.php b/cake/libs/view/helpers/rss.php
index 5ab558308..3a7855a71 100644
--- a/cake/libs/view/helpers/rss.php
+++ b/cake/libs/view/helpers/rss.php
@@ -5,7 +5,7 @@
  *
  * Simplifies the output of RSS feeds.
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php
index d8303fb7b..cec43c1fe 100644
--- a/cake/libs/view/helpers/session.php
+++ b/cake/libs/view/helpers/session.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php
index 546b0e632..680d931e6 100644
--- a/cake/libs/view/helpers/text.php
+++ b/cake/libs/view/helpers/text.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php
index 637514cb2..1181f9e6c 100644
--- a/cake/libs/view/helpers/time.php
+++ b/cake/libs/view/helpers/time.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/helpers/xml.php b/cake/libs/view/helpers/xml.php
index aeec5ab36..df7033bd1 100644
--- a/cake/libs/view/helpers/xml.php
+++ b/cake/libs/view/helpers/xml.php
@@ -5,7 +5,7 @@
  *
  * Simplifies the output of XML documents.
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/layouts/ajax.ctp b/cake/libs/view/layouts/ajax.ctp
index a3440dd2c..94d922b5f 100644
--- a/cake/libs/view/layouts/ajax.ctp
+++ b/cake/libs/view/layouts/ajax.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/layouts/default.ctp b/cake/libs/view/layouts/default.ctp
index 79efc313a..b3c4852d1 100644
--- a/cake/libs/view/layouts/default.ctp
+++ b/cake/libs/view/layouts/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/layouts/email/html/default.ctp b/cake/libs/view/layouts/email/html/default.ctp
index fdac9bd00..b37812ffc 100644
--- a/cake/libs/view/layouts/email/html/default.ctp
+++ b/cake/libs/view/layouts/email/html/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/layouts/email/text/default.ctp b/cake/libs/view/layouts/email/text/default.ctp
index 8131e4710..c518b4211 100644
--- a/cake/libs/view/layouts/email/text/default.ctp
+++ b/cake/libs/view/layouts/email/text/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/layouts/flash.ctp b/cake/libs/view/layouts/flash.ctp
index c48aaf62e..9c0b8aa47 100644
--- a/cake/libs/view/layouts/flash.ctp
+++ b/cake/libs/view/layouts/flash.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/media.php b/cake/libs/view/media.php
index 2ec12d66b..71c4e43a2 100644
--- a/cake/libs/view/media.php
+++ b/cake/libs/view/media.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp
index d63519b95..8c99ccbf7 100644
--- a/cake/libs/view/pages/home.ctp
+++ b/cake/libs/view/pages/home.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/scaffolds/edit.ctp b/cake/libs/view/scaffolds/edit.ctp
index 215a77aed..40dbfe0fe 100644
--- a/cake/libs/view/scaffolds/edit.ctp
+++ b/cake/libs/view/scaffolds/edit.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/scaffolds/index.ctp b/cake/libs/view/scaffolds/index.ctp
index 79039c02d..f45f8ad9f 100644
--- a/cake/libs/view/scaffolds/index.ctp
+++ b/cake/libs/view/scaffolds/index.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/scaffolds/view.ctp b/cake/libs/view/scaffolds/view.ctp
index 11ff93796..77d06737d 100644
--- a/cake/libs/view/scaffolds/view.ctp
+++ b/cake/libs/view/scaffolds/view.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/theme.php b/cake/libs/view/theme.php
index 0c318e643..0f4b33971 100644
--- a/cake/libs/view/theme.php
+++ b/cake/libs/view/theme.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index ca2319a0b..5fb2f605f 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index 81acb6921..ba37d5d96 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/console/libs/acl.test.php b/cake/tests/cases/console/libs/acl.test.php
index 145d7b70e..808b163a5 100644
--- a/cake/tests/cases/console/libs/acl.test.php
+++ b/cake/tests/cases/console/libs/acl.test.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/console/libs/api.test.php b/cake/tests/cases/console/libs/api.test.php
index 29f84eafe..93f8ddda6 100644
--- a/cake/tests/cases/console/libs/api.test.php
+++ b/cake/tests/cases/console/libs/api.test.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/console/libs/schema.test.php b/cake/tests/cases/console/libs/schema.test.php
index 57c850590..9e3eda076 100644
--- a/cake/tests/cases/console/libs/schema.test.php
+++ b/cake/tests/cases/console/libs/schema.test.php
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/console/libs/shell.test.php b/cake/tests/cases/console/libs/shell.test.php
index 5117da879..418c31afa 100644
--- a/cake/tests/cases/console/libs/shell.test.php
+++ b/cake/tests/cases/console/libs/shell.test.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/console/libs/tasks/extract.test.php b/cake/tests/cases/console/libs/tasks/extract.test.php
index 51c50d89b..354292f00 100644
--- a/cake/tests/cases/console/libs/tasks/extract.test.php
+++ b/cake/tests/cases/console/libs/tasks/extract.test.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php
index e47d35bf0..a7d89b1ba 100644
--- a/cake/tests/cases/console/libs/tasks/model.test.php
+++ b/cake/tests/cases/console/libs/tasks/model.test.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/console/libs/tasks/test.test.php b/cake/tests/cases/console/libs/tasks/test.test.php
index a07f26989..598d10ed3 100644
--- a/cake/tests/cases/console/libs/tasks/test.test.php
+++ b/cake/tests/cases/console/libs/tasks/test.test.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/libs/cake_test_case.test.php b/cake/tests/cases/libs/cake_test_case.test.php
index 7b0a486b8..ae2719959 100644
--- a/cake/tests/cases/libs/cake_test_case.test.php
+++ b/cake/tests/cases/libs/cake_test_case.test.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/libs/magic_db.test.php b/cake/tests/cases/libs/magic_db.test.php
index 1ef07f6b9..e040e6041 100644
--- a/cake/tests/cases/libs/magic_db.test.php
+++ b/cake/tests/cases/libs/magic_db.test.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/libs/model/behavior.test.php b/cake/tests/cases/libs/model/behavior.test.php
index 93516ab86..10ddad8d9 100644
--- a/cake/tests/cases/libs/model/behavior.test.php
+++ b/cake/tests/cases/libs/model/behavior.test.php
@@ -7,12 +7,12 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * @copyright     CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * @link          http://www.cakephp.org
  * @package       cake
  * @subpackage    cake.tests.cases.libs.model
diff --git a/cake/tests/cases/libs/model/behaviors/acl.test.php b/cake/tests/cases/libs/model/behaviors/acl.test.php
index c43d52c25..d1a468a6b 100644
--- a/cake/tests/cases/libs/model/behaviors/acl.test.php
+++ b/cake/tests/cases/libs/model/behaviors/acl.test.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
index 5188f24fd..76d71396e 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
index 286569656..7ea712a42 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
index f3dccc199..1da1ba3fd 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
index f3de27127..ce14552a4 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
index 40063ddf8..e1298054a 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
index 03ebfd919..e7d2de630 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
index 3cf4cbf1a..ca795e16e 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
@@ -5,7 +5,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/fixtures/ad_fixture.php b/cake/tests/fixtures/ad_fixture.php
index 17c873b34..c5ee0257e 100644
--- a/cake/tests/fixtures/ad_fixture.php
+++ b/cake/tests/fixtures/ad_fixture.php
@@ -7,12 +7,12 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * @copyright     CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * @link          http://www.cakephp.org
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/after_tree_fixture.php b/cake/tests/fixtures/after_tree_fixture.php
index 45e2d0948..1b2fa5dc6 100644
--- a/cake/tests/fixtures/after_tree_fixture.php
+++ b/cake/tests/fixtures/after_tree_fixture.php
@@ -7,12 +7,12 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * @copyright     CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * @link          http://www.cakephp.org
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/campaign_fixture.php b/cake/tests/fixtures/campaign_fixture.php
index cdb2a1aa0..511ecb107 100644
--- a/cake/tests/fixtures/campaign_fixture.php
+++ b/cake/tests/fixtures/campaign_fixture.php
@@ -7,12 +7,12 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * @copyright     CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * @link          http://www.cakephp.org
  * @package       cake
  * @subpackage    cake.tests.fixtures
diff --git a/cake/tests/fixtures/datatype_fixture.php b/cake/tests/fixtures/datatype_fixture.php
index 6414f2d2c..fc2071063 100644
--- a/cake/tests/fixtures/datatype_fixture.php
+++ b/cake/tests/fixtures/datatype_fixture.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/fixtures/dependency_fixture.php b/cake/tests/fixtures/dependency_fixture.php
index e9574b83f..7ee654b32 100644
--- a/cake/tests/fixtures/dependency_fixture.php
+++ b/cake/tests/fixtures/dependency_fixture.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/fixtures/node_fixture.php b/cake/tests/fixtures/node_fixture.php
index 6329abc52..aeb176ae9 100644
--- a/cake/tests/fixtures/node_fixture.php
+++ b/cake/tests/fixtures/node_fixture.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/config/acl.ini.php b/cake/tests/test_app/config/acl.ini.php
index d5e1b3394..1b27291e6 100644
--- a/cake/tests/test_app/config/acl.ini.php
+++ b/cake/tests/test_app/config/acl.ini.php
@@ -6,7 +6,7 @@
 ; *
 ; * PHP versions 4 and 5
 ; *
-; * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+; * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 ; * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
 ; *
 ; *  Licensed under The MIT License
diff --git a/cake/tests/test_app/models/behaviors/persister_one_behavior.php b/cake/tests/test_app/models/behaviors/persister_one_behavior.php
index 703432b7e..b7ee6189c 100644
--- a/cake/tests/test_app/models/behaviors/persister_one_behavior.php
+++ b/cake/tests/test_app/models/behaviors/persister_one_behavior.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/models/behaviors/persister_two_behavior.php b/cake/tests/test_app/models/behaviors/persister_two_behavior.php
index 798913c1d..c083614d3 100644
--- a/cake/tests/test_app/models/behaviors/persister_two_behavior.php
+++ b/cake/tests/test_app/models/behaviors/persister_two_behavior.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/models/comment.php b/cake/tests/test_app/models/comment.php
index 497a422da..166e67380 100644
--- a/cake/tests/test_app/models/comment.php
+++ b/cake/tests/test_app/models/comment.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/models/persister_one.php b/cake/tests/test_app/models/persister_one.php
index f3048e4b7..3e4a8ca5f 100644
--- a/cake/tests/test_app/models/persister_one.php
+++ b/cake/tests/test_app/models/persister_one.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/models/persister_two.php b/cake/tests/test_app/models/persister_two.php
index 5f8b56263..69b4bf8d6 100644
--- a/cake/tests/test_app/models/persister_two.php
+++ b/cake/tests/test_app/models/persister_two.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/models/post.php b/cake/tests/test_app/models/post.php
index 6ab391e99..65eef04d3 100644
--- a/cake/tests/test_app/models/post.php
+++ b/cake/tests/test_app/models/post.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
index 0eb5802bc..adfda0ab0 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
index 860d8288c..dff3d6b1f 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
index ed148e8ef..f447c3735 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2008, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
index d62fa565c..5330ba97c 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2008, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
index d575d709c..33b4ab186 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
+++ b/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
@@ -7,7 +7,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP :  Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright 2006-2010, Cake Software Foundation, Inc.
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/views/elements/email/html/default.ctp b/cake/tests/test_app/views/elements/email/html/default.ctp
index a70d09778..c12b78061 100644
--- a/cake/tests/test_app/views/elements/email/html/default.ctp
+++ b/cake/tests/test_app/views/elements/email/html/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/views/elements/email/text/default.ctp b/cake/tests/test_app/views/elements/email/text/default.ctp
index d3f885b5c..f4dbc133d 100644
--- a/cake/tests/test_app/views/elements/email/text/default.ctp
+++ b/cake/tests/test_app/views/elements/email/text/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/views/elements/email/text/wide.ctp b/cake/tests/test_app/views/elements/email/text/wide.ctp
index 312ee2e21..3483ef7df 100644
--- a/cake/tests/test_app/views/elements/email/text/wide.ctp
+++ b/cake/tests/test_app/views/elements/email/text/wide.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/views/layouts/ajax.ctp b/cake/tests/test_app/views/layouts/ajax.ctp
index a3440dd2c..94d922b5f 100644
--- a/cake/tests/test_app/views/layouts/ajax.ctp
+++ b/cake/tests/test_app/views/layouts/ajax.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/views/layouts/ajax2.ctp b/cake/tests/test_app/views/layouts/ajax2.ctp
index 779707cdf..11384e044 100644
--- a/cake/tests/test_app/views/layouts/ajax2.ctp
+++ b/cake/tests/test_app/views/layouts/ajax2.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/views/layouts/cache_layout.ctp b/cake/tests/test_app/views/layouts/cache_layout.ctp
index 901b875b6..41d7918fd 100644
--- a/cake/tests/test_app/views/layouts/cache_layout.ctp
+++ b/cake/tests/test_app/views/layouts/cache_layout.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/views/layouts/default.ctp b/cake/tests/test_app/views/layouts/default.ctp
index d47a8533b..e824126d5 100644
--- a/cake/tests/test_app/views/layouts/default.ctp
+++ b/cake/tests/test_app/views/layouts/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/views/layouts/email/html/default.ctp b/cake/tests/test_app/views/layouts/email/html/default.ctp
index dbf7916be..e68167aea 100644
--- a/cake/tests/test_app/views/layouts/email/html/default.ctp
+++ b/cake/tests/test_app/views/layouts/email/html/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/views/layouts/email/html/thin.ctp b/cake/tests/test_app/views/layouts/email/html/thin.ctp
index 33e905a65..3da2c728b 100644
--- a/cake/tests/test_app/views/layouts/email/html/thin.ctp
+++ b/cake/tests/test_app/views/layouts/email/html/thin.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/views/layouts/email/text/default.ctp b/cake/tests/test_app/views/layouts/email/text/default.ctp
index aeef64f2b..262938d63 100644
--- a/cake/tests/test_app/views/layouts/email/text/default.ctp
+++ b/cake/tests/test_app/views/layouts/email/text/default.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/views/layouts/flash.ctp b/cake/tests/test_app/views/layouts/flash.ctp
index 8465565d9..a76a858a7 100644
--- a/cake/tests/test_app/views/layouts/flash.ctp
+++ b/cake/tests/test_app/views/layouts/flash.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/views/layouts/multi_cache.ctp b/cake/tests/test_app/views/layouts/multi_cache.ctp
index 99f0f37fd..73af70d4e 100644
--- a/cake/tests/test_app/views/layouts/multi_cache.ctp
+++ b/cake/tests/test_app/views/layouts/multi_cache.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/views/posts/sequencial_nocache.ctp b/cake/tests/test_app/views/posts/sequencial_nocache.ctp
index 8411db54a..f14619e09 100644
--- a/cake/tests/test_app/views/posts/sequencial_nocache.ctp
+++ b/cake/tests/test_app/views/posts/sequencial_nocache.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/cake/tests/test_app/views/posts/test_nocache_tags.ctp b/cake/tests/test_app/views/posts/test_nocache_tags.ctp
index 7a62dddeb..20c6baa6f 100644
--- a/cake/tests/test_app/views/posts/test_nocache_tags.ctp
+++ b/cake/tests/test_app/views/posts/test_nocache_tags.ctp
@@ -4,7 +4,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
diff --git a/index.php b/index.php
index d34d6fedc..f3ed13b7d 100644
--- a/index.php
+++ b/index.php
@@ -9,7 +9,7 @@
  *
  * PHP versions 4 and 5
  *
- * CakePHP(tm) : Rapid Development Framework (http://www.cakephp.org)
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License

From 2d81d25f410ec9c2527fab92c769e72e04134a0e Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Wed, 27 Jan 2010 11:08:04 -0500
Subject: [PATCH 172/244] Fixing issue where webroot paths would be incorrect
 when using a virtual host setup and no mod_rewrite.  An additional
 app/webroot would be appended.  Incorrect tests updated. Fixes #259

---
 cake/dispatcher.php                  | 17 ++++++++++-------
 cake/tests/cases/dispatcher.test.php | 14 +++++++-------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index 7c241473c..3aa8b9510 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -367,21 +367,24 @@ function baseUrl() {
 			$this->webroot = $base .'/';
 			return $base;
 		}
-			$file = '/' . basename($baseUrl);
-			$base = dirname($baseUrl);
 
-			if ($base === DS || $base === '.') {
-				$base = '';
-			}
-			$this->webroot = $base .'/';
+		$file = '/' . basename($baseUrl);
+		$base = dirname($baseUrl);
 
+		if ($base === DS || $base === '.') {
+			$base = '';
+		}
+		$this->webroot = $base .'/';
+
+		if (!empty($base)) {
 			if (strpos($this->webroot, $dir) === false) {
 				$this->webroot .= $dir . '/' ;
 			}
 			if (strpos($this->webroot, $webroot) === false) {
 				$this->webroot .= $webroot . '/';
 			}
-			return $base . $file;
+		}
+		return $base . $file;
 	}
 /**
  * Restructure params in case we're serving a plugin.
diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php
index 98f6312fb..f7da2949b 100644
--- a/cake/tests/cases/dispatcher.test.php
+++ b/cake/tests/cases/dispatcher.test.php
@@ -1103,7 +1103,7 @@ function testBaseUrlAndWebrootWithBaseUrl() {
 		$result = $Dispatcher->baseUrl();
 		$expected = '/index.php';
 		$this->assertEqual($expected, $result);
-		$expectedWebroot = '/app/webroot/';
+		$expectedWebroot = '/';
 		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
 
 		Configure::write('App.baseUrl', '/CakeBB/app/webroot/index.php');
@@ -1174,12 +1174,12 @@ function testBaseUrlAndWebrootWithBase() {
  */
 	function testMissingController() {
 		$Dispatcher =& new TestDispatcher();
-		Configure::write('App.baseUrl','/index.php');
+		Configure::write('App.baseUrl', '/index.php');
 		$url = 'some_controller/home/param:value/param2:value2';
 		$controller = $Dispatcher->dispatch($url, array('return' => 1));
 		$expected = array('missingController', array(array(
 			'className' => 'SomeControllerController',
-			'webroot' => '/app/webroot/',
+			'webroot' => '/',
 			'url' => 'some_controller/home/param:value/param2:value2',
 			'base' => '/index.php'
 		)));
@@ -1201,7 +1201,7 @@ function testPrivate() {
 		$expected = array('privateAction', array(array(
 			'className' => 'SomePagesController',
 			'action' => '_protected',
-			'webroot' => '/app/webroot/',
+			'webroot' => '/',
 			'url' => 'some_pages/_protected/param:value/param2:value2',
 			'base' => '/index.php'
 		)));
@@ -1215,7 +1215,7 @@ function testPrivate() {
  */
 	function testMissingAction() {
 		$Dispatcher =& new TestDispatcher();
-		Configure::write('App.baseUrl','/index.php');
+		Configure::write('App.baseUrl', '/index.php');
 		$url = 'some_pages/home/param:value/param2:value2';
 
 		$controller = $Dispatcher->dispatch($url, array('return'=> 1));
@@ -1223,7 +1223,7 @@ function testMissingAction() {
 		$expected = array('missingAction', array(array(
 			'className' => 'SomePagesController',
 			'action' => 'home',
-			'webroot' => '/app/webroot/',
+			'webroot' => '/',
 			'url' => '/index.php/some_pages/home/param:value/param2:value2',
 			'base' => '/index.php'
 		)));
@@ -1238,7 +1238,7 @@ function testMissingAction() {
 		$expected = array('missingAction', array(array(
 			'className' => 'SomePagesController',
 			'action' => 'redirect',
-			'webroot' => '/app/webroot/',
+			'webroot' => '/',
 			'url' => '/index.php/some_pages/redirect/param:value/param2:value2',
 			'base' => '/index.php'
 		)));

From 7cfb5aba8ddcba05fe9d55a3182efd5477d0905a Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Fri, 29 Jan 2010 11:21:37 -0500
Subject: [PATCH 173/244] Minor refactor of Model::_deleteLinks to improve
 readability.

---
 cake/libs/model/model.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 78be07d47..1d82dbaca 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1825,14 +1825,15 @@ function _deleteDependent($id, $cascade) {
  */
 	function _deleteLinks($id) {
 		foreach ($this->hasAndBelongsToMany as $assoc => $data) {
-			$records = $this->{$data['with']}->find('all', array(
-				'conditions' => array_merge(array($this->{$data['with']}->escapeField($data['foreignKey']) => $id)),
-				'fields' => $this->{$data['with']}->primaryKey,
+			$joinModel = $data['with'];
+			$records = $this->{$joinModel}->find('all', array(
+				'conditions' => array_merge(array($this->{$joinModel}->escapeField($data['foreignKey']) => $id)),
+				'fields' => $this->{$joinModel}->primaryKey,
 				'recursive' => -1
 			));
 			if (!empty($records)) {
 				foreach ($records as $record) {
-					$this->{$data['with']}->delete($record[$this->{$data['with']}->alias][$this->{$data['with']}->primaryKey]);
+					$this->{$joinModel}->delete($record[$this->{$joinModel}->alias][$this->{$joinModel}->primaryKey]);
 				}
 			}
 		}

From 7ac87d8543dfbdf0e8b087524f647e81fe3b814b Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Fri, 29 Jan 2010 21:35:00 -0500
Subject: [PATCH 174/244] Updating links on home.ctp to point at github and
 lighthouse.

---
 cake/libs/view/pages/home.ctp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp
index 61c427c60..c8534b115 100644
--- a/cake/libs/view/pages/home.ctp
+++ b/cake/libs/view/pages/home.ctp
@@ -26,7 +26,7 @@ if (Configure::read() == 0):
 endif;
 ?>
 <h2><?php echo sprintf(__('Release Notes for CakePHP %s.', true), Configure::version()); ?></h2>
-<a href="http://code.cakephp.org/wiki/changelog/1_2_x_x"><?php __('Read the changelog'); ?> </a>
+<a href="http://cakephp.lighthouseapp.com/projects/42648/changelog-1-2-5"><?php __('Read the changelog'); ?> </a>
 <?php
 if (Configure::read() > 0):
 	Debugger::checkSessionKey();
@@ -136,8 +136,10 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
 	<ul><li><?php __('Community mailing list'); ?></li></ul></li>
 	<li><a href="irc://irc.freenode.net/cakephp">irc.freenode.net #cakephp</a>
 	<ul><li><?php __('Live chat about CakePHP'); ?></li></ul></li>
-	<li><a href="https://code.cakephp.org/"><?php __('CakePHP Code'); ?> </a>
-	<ul><li><?php __('For the Development of CakePHP (Tickets, Git browser, Roadmap, Changelogs)'); ?></li></ul></li>
+	<li><a href="http://github.com/cakephp/"><?php __('CakePHP Code'); ?> </a>
+	<ul><li><?php __('For the Development of CakePHP Git repository, Downloads'); ?></li></ul></li>
+	<li><a href="http://cakephp.lighthouseapp.com/"><?php __('CakePHP Lighthouse'); ?> </a>
+	<ul><li><?php __('CakePHP Tickets, Wiki pages, Roadmap'); ?></li></ul></li>
 	<li><a href="http://www.cakeforge.org"><?php __('CakeForge'); ?> </a>
 	<ul><li><?php __('Open Development for CakePHP'); ?></li></ul></li>
 	<li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php __('Book Store'); ?> </a>

From be7ddfb972a1fc508c3e4b0d8c78494923bc20e2 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Fri, 29 Jan 2010 21:54:54 -0500
Subject: [PATCH 175/244] Updating version numbers to 1.2.6

---
 cake/VERSION.txt              | 2 +-
 cake/config/config.php        | 2 +-
 cake/libs/view/pages/home.ctp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cake/VERSION.txt b/cake/VERSION.txt
index 3a1f10eae..7e099ec5d 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -1 +1 @@
-1.2.5
\ No newline at end of file
+1.2.6
\ No newline at end of file
diff --git a/cake/config/config.php b/cake/config/config.php
index f4f248de0..fff46b1a1 100644
--- a/cake/config/config.php
+++ b/cake/config/config.php
@@ -22,5 +22,5 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-return $config['Cake.version'] = '1.2.5';
+return $config['Cake.version'] = '1.2.6';
 ?>
\ No newline at end of file
diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp
index c8534b115..38db9ba3f 100644
--- a/cake/libs/view/pages/home.ctp
+++ b/cake/libs/view/pages/home.ctp
@@ -26,7 +26,7 @@ if (Configure::read() == 0):
 endif;
 ?>
 <h2><?php echo sprintf(__('Release Notes for CakePHP %s.', true), Configure::version()); ?></h2>
-<a href="http://cakephp.lighthouseapp.com/projects/42648/changelog-1-2-5"><?php __('Read the changelog'); ?> </a>
+<a href="http://cakephp.lighthouseapp.com/projects/42648/changelog-1-2-6"><?php __('Read the changelog'); ?> </a>
 <?php
 if (Configure::read() > 0):
 	Debugger::checkSessionKey();

From 8d382d9168e98140367e908d1855e70292b71f5f Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Tue, 2 Feb 2010 09:13:52 +1100
Subject: [PATCH 176/244] Fixes #288. TextHelper truncation not playing nice
 with html in ending.

---
 cake/libs/view/helpers/text.php                  | 3 +--
 cake/tests/cases/libs/view/helpers/text.test.php | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php
index 737681ef9..37d25ac8b 100644
--- a/cake/libs/view/helpers/text.php
+++ b/cake/libs/view/helpers/text.php
@@ -168,7 +168,7 @@ function truncate($text, $length = 100, $ending = '...', $exact = true, $conside
 			if (mb_strlen(preg_replace('/<.*?>/', '', $text)) <= $length) {
 				return $text;
 			}
-			$totalLength = mb_strlen($ending);
+			$totalLength = mb_strlen(strip_tags($ending));
 			$openTags = array();
 			$truncate = '';
 			preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
@@ -210,7 +210,6 @@ function truncate($text, $length = 100, $ending = '...', $exact = true, $conside
 					break;
 				}
 			}
-
 		} else {
 			if (mb_strlen($text) <= $length) {
 				return $text;
diff --git a/cake/tests/cases/libs/view/helpers/text.test.php b/cake/tests/cases/libs/view/helpers/text.test.php
index 283e17df0..6aa35d21d 100644
--- a/cake/tests/cases/libs/view/helpers/text.test.php
+++ b/cake/tests/cases/libs/view/helpers/text.test.php
@@ -100,7 +100,9 @@ function testTruncate() {
 		$this->assertIdentical($this->Text->{$m}($text7, 255), $text7);
 		$this->assertIdentical($this->Text->{$m}($text7, 15), 'El moño está...');
 		$this->assertIdentical($this->Text->{$m}($text8, 15), 'Vive la R'.chr(195).chr(169).'pu...');
-
+		$this->assertIdentical($this->Text->{$m}($text1, 25, 'Read more'), 'The quick brown Read more');
+		$this->assertIdentical($this->Text->{$m}($text1, 25, '<a href="http://www.google.com/">Read more</a>', true, true), 'The quick brown <a href="http://www.google.com/">Read more</a>');
+		
 		if ($this->method == 'truncate') {
 			$this->method = 'trim';
 			$this->testTruncate();

From 205c95ef65e3a41cfef6ab11ffa1fa044e967470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Perras?= <joel.perras@gmail.com>
Date: Tue, 2 Feb 2010 11:45:57 -0500
Subject: [PATCH 177/244] Fix array_values() warning when using Tree Behavior
 under certain situations.

In TreeBehavior::_setParent(), if the $Model->find('first') returned
false, then array_values() would throw a warning.
---
 cake/libs/model/behaviors/tree.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php
index addd8c6c2..126f5aac1 100644
--- a/cake/libs/model/behaviors/tree.php
+++ b/cake/libs/model/behaviors/tree.php
@@ -808,11 +808,16 @@ function _setParent(&$Model, $parentId = null, $created = false) {
 			$this->__sync($Model, $edge - $node[$left] + 1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right], $created);
 			$this->__sync($Model, $node[$right] - $node[$left] + 1, '-', '> ' . $node[$left], $created);
 		} else {
-			$parentNode = array_values($Model->find('first', array(
+			$values = $Model->find('first', array(
 				'conditions' => array($scope, $Model->escapeField() => $parentId),
 				'fields' => array($Model->primaryKey, $left, $right),
 				'recursive' => $recursive
-			)));
+			));
+
+			if ($values === false) {
+				return false;
+			}
+			$parentNode = array_values($values);
 
 			if (empty($parentNode) || empty($parentNode[0])) {
 				return false;

From 4b269e3170a5e4724e7bd05d83537905cab27f4e Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Tue, 2 Feb 2010 20:39:05 -0500
Subject: [PATCH 178/244] Fixing RequestHandler::beforeRedirect() and issues
 with array urls, where incompatibilities between standard url arrays and
 requestAction url arrays caused incorrect results.  Tests added.  Fixes #276

---
 .../controller/components/request_handler.php |  3 ++
 .../components/request_handler.test.php       | 39 +++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php
index c5bc6184e..681d8b34a 100644
--- a/cake/libs/controller/components/request_handler.php
+++ b/cake/libs/controller/components/request_handler.php
@@ -230,6 +230,9 @@ function beforeRedirect(&$controller, $url) {
 		foreach ($_POST as $key => $val) {
 			unset($_POST[$key]);
 		}
+		if (is_array($url)) {
+			$url = Router::url($url + array('base' => false));
+		}
 		echo $this->requestAction($url, array('return'));
 		$this->_stop();
 	}
diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php
index b9cc6e762..97f1e0751 100644
--- a/cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/cake/tests/cases/libs/controller/components/request_handler.test.php
@@ -70,6 +70,15 @@ function destination() {
 		$this->viewPath = 'posts';
 		$this->render('index');
 	}
+/**
+ * test method for ajax redirection + parameter parsing
+ *
+ * @return void
+ */
+	function param_method($one = null, $two = null) {
+		echo "one: $one two: $two";
+		$this->autoRender = false;
+	}
 }
 /**
  * RequestHandlerTestDisabledController class
@@ -541,5 +550,35 @@ function testAjaxRedirectAsRequestAction() {
 		Configure::write('viewPaths', $_paths);
 		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
 	}
+
+/**
+ * test that the beforeRedirect callback properly converts
+ * array urls into their correct string ones, and adds base => false so
+ * the correct urls are generated.
+ *
+ * @link http://cakephp.lighthouseapp.com/projects/42648-cakephp-1x/tickets/276
+ * @return void
+ */
+	function testBeforeRedirectCallbackWithArrayUrl() {
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		), true);
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'named' => array(), 'form' => array(), 'url' => array('url' => 'accounts/'), 'bare' => 0),
+			array('base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/')
+		));
+
+		$RequestHandler =& new NoStopRequestHandler();
+
+		ob_start();
+		$RequestHandler->beforeRedirect(
+			$this->Controller,
+			array('controller' => 'request_handler_test', 'action' => 'param_method', 'first', 'second')
+		);
+		$result = ob_get_clean();
+		$this->assertEqual($result, 'one: first two: second');
+		App::build();
+	}
 }
 ?>
\ No newline at end of file

From 2c1e6de7d628f38904f79ad631d5378254399305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Perras?= <joel.perras@gmail.com>
Date: Fri, 5 Feb 2010 13:18:46 -0500
Subject: [PATCH 179/244]  Another fix for array_values() throwing a warning
 when using Tree Behavior under certain situations.

---
 cake/libs/model/behaviors/tree.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php
index 5ccc21591..311ff2efb 100644
--- a/cake/libs/model/behaviors/tree.php
+++ b/cake/libs/model/behaviors/tree.php
@@ -163,10 +163,15 @@ function beforeSave(&$Model) {
 				$Model->data[$Model->alias][$parent] = null;
 				$this->_addToWhitelist($Model, $parent);
 			} else {
-				list($node) = array_values($Model->find('first', array(
+				$values = $Model->find('first', array(
 					'conditions' => array($scope,$Model->escapeField() => $Model->id),
 					'fields' => array($Model->primaryKey, $parent, $left, $right ), 'recursive' => $recursive)
-				));
+				);
+
+				if ($values === false) {
+					return false;
+				}
+				list($node) = array_values($values);
 
 				$parentNode = $Model->find('first', array(
 					'conditions' => array($scope, $Model->escapeField() => $Model->data[$Model->alias][$parent]),

From 104da15a737a13283f827d049beb1d0bea5344d5 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 6 Feb 2010 14:20:28 -0500
Subject: [PATCH 180/244] Making built-in Canadian postal code validation
 accept postal codes with no spaces.  Fixes #289

---
 cake/libs/validation.php                  | 2 +-
 cake/tests/cases/libs/validation.test.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index 6638f6973..09bdbcc5c 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -713,7 +713,7 @@ function postal($check, $regex = null, $country = null) {
 					$_this->regex  = '/\\A\\b[A-Z]{1,2}[0-9][A-Z0-9]? [0-9][ABD-HJLNP-UW-Z]{2}\\b\\z/i';
 					break;
 				case 'ca':
-					$_this->regex  = '/\\A\\b[ABCEGHJKLMNPRSTVXY][0-9][A-Z] [0-9][A-Z][0-9]\\b\\z/i';
+					$_this->regex  = '/\\A\\b[ABCEGHJKLMNPRSTVXY][0-9][A-Z] ?[0-9][A-Z][0-9]\\b\\z/i';
 					break;
 				case 'it':
 				case 'de':
diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php
index 3adb5d38f..ecac28cc2 100644
--- a/cake/tests/cases/libs/validation.test.php
+++ b/cake/tests/cases/libs/validation.test.php
@@ -1928,6 +1928,7 @@ function testPostal() {
 		$this->assertFalse(Validation::postal('B2A 2AB', null, 'ca'));
 		$this->assertTrue(Validation::postal('X0A 0A2', null, 'ca'));
 		$this->assertTrue(Validation::postal('G4V 4C3', null, 'ca'));
+		$this->assertTrue(Validation::postal('L4J8D6', null, 'ca'));
 
 		$this->assertFalse(Validation::postal('111', null, 'us'));
 		$this->assertFalse(Validation::postal('1111', null, 'us'));

From 2cf294a749144b2cca2d06bab5db24abcb20f3c8 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 6 Feb 2010 14:30:39 -0500
Subject: [PATCH 181/244] Fixing typo in Finland for sv-fi language.  Fixes
 #308

---
 cake/libs/l10n.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php
index db82c59da..96d334ae5 100644
--- a/cake/libs/l10n.php
+++ b/cake/libs/l10n.php
@@ -294,7 +294,7 @@ class L10n extends Object {
 										'sq' => array('language' => 'Albanian', 'locale' => 'alb', 'localeFallback' => 'alb', 'charset' => 'utf-8'),
 										'sr' => array('language' => 'Serbian', 'locale' => 'scc', 'localeFallback' => 'scc', 'charset' => 'utf-8'),
 										'sv' => array('language' => 'Swedish', 'locale' => 'swe', 'localeFallback' => 'swe', 'charset' => 'utf-8'),
-										'sv-fi' => array('language' => 'Swedish (Findland)', 'locale' => 'sv_fi', 'localeFallback' => 'swe', 'charset' => 'utf-8'),
+										'sv-fi' => array('language' => 'Swedish (Finland)', 'locale' => 'sv_fi', 'localeFallback' => 'swe', 'charset' => 'utf-8'),
 										'sx' => array('language' => 'Sutu', 'locale' => 'sx', 'localeFallback' => 'sx', 'charset' => 'utf-8'),
 										'sz' => array('language' => 'Sami (Lappish)', 'locale' => 'smi', 'localeFallback' => 'smi', 'charset' => 'utf-8'),
 										'th' => array('language' => 'Thai', 'locale' => 'tha', 'localeFallback' => 'tha', 'charset' => 'utf-8'),

From 0fda18d11c95d285d7c0ac4064175e6d65136817 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Mon, 8 Feb 2010 23:07:13 -0500
Subject: [PATCH 182/244] Fixing entity encoding of url strings inside
 remoteFunctions contained in safe CDATA blocks.  Fixes #127

---
 cake/libs/view/helpers/ajax.php                  | 10 +++++++++-
 cake/tests/cases/libs/view/helpers/ajax.test.php |  7 +++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php
index c393e3fb5..a575213fd 100644
--- a/cake/libs/view/helpers/ajax.php
+++ b/cake/libs/view/helpers/ajax.php
@@ -212,6 +212,7 @@ function link($title, $href = null, $options = array(), $confirm = null, $escape
 			unset($confirm);
 		}
 		$htmlOptions = $this->__getHtmlOptions($options, array('url'));
+		$options += array('safe' => true);
 
 		if (empty($options['fallback']) || !isset($options['fallback'])) {
 			$options['fallback'] = $href;
@@ -257,7 +258,14 @@ function remoteFunction($options) {
 			$func = "new Ajax.Request(";
 		}
 
-		$func .= "'" . $this->url(isset($options['url']) ? $options['url'] : "") . "'";
+		$url = isset($options['url']) ? $options['url'] : "";
+		if (empty($options['safe'])) {
+			$url = $this->url($url);
+		} else {
+			$url = Router::url($url);
+		}
+
+		$func .= "'" . $url . "'";
 		$func .= ", " . $this->__optionsForAjax($options) . ")";
 
 		if (isset($options['before'])) {
diff --git a/cake/tests/cases/libs/view/helpers/ajax.test.php b/cake/tests/cases/libs/view/helpers/ajax.test.php
index 6df2e9c50..3cdddaf74 100644
--- a/cake/tests/cases/libs/view/helpers/ajax.test.php
+++ b/cake/tests/cases/libs/view/helpers/ajax.test.php
@@ -557,6 +557,13 @@ function testLink() {
 		$this->assertPattern("/Event.observe\('link[0-9]+', [\w\d,'\(\)\s{}]+Ajax\.Request\([\w\d\s,'\(\){}:\/]+onComplete:function\(request, json\) {test}/", $result);
 		$this->assertNoPattern('/^<a[^<>]+complete="test"[^<>]*>Ajax Link<\/a>/', $result);
 		$this->assertNoPattern('/^<a\s+[^<>]*url="[^"]*"[^<>]*>/', $result);
+
+		$result = $this->Ajax->link(
+			'Ajax Link',
+			array('controller' => 'posts', 'action' => 'index', '?' => array('one' => '1', 'two' => '2')),
+			array('update' => 'myDiv', 'id' => 'myLink')
+		);
+		$this->assertPattern('#/posts/\?one\=1\&two\=2#', $result);
 	}
 /**
  * testRemoteTimer method

From d5ea6b7c2a99bbda503f2247702aa4a6953dcf1b Mon Sep 17 00:00:00 2001
From: "renan.saddam" <renan.saddam@gmail.com>
Date: Fri, 12 Feb 2010 01:57:04 -0200
Subject: [PATCH 183/244] Flushing the CR after a model is baked, tests added.
 Refs #310.

---
 cake/console/libs/tasks/model.php             |  1 +
 .../cases/console/libs/tasks/model.test.php   | 22 +++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index fac911605..95136bb88 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -666,6 +666,7 @@ function bake($name, $associations = array(),  $validate = array(), $primaryKey
 		}
 		$out .= "}\n";
 		$out .= "?>";
+		ClassRegistry::flush();
 		$filename = $this->path . Inflector::underscore($name) . '.php';
 		$this->out("\nBaking model class for $name...");
 		return $this->createFile($filename, $out);
diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php
index f61262f21..0b4fc2af0 100644
--- a/cake/tests/cases/console/libs/tasks/model.test.php
+++ b/cake/tests/cases/console/libs/tasks/model.test.php
@@ -44,7 +44,7 @@
 );
 Mock::generatePartial(
 	'ModelTask', 'MockModelTask',
-	array('in', 'out', 'createFile')
+	array('in', 'out', 'createFile', '_checkUnitTest')
 );
 /**
  * ModelTaskTest class
@@ -53,7 +53,7 @@
  * @subpackage    cake.tests.cases.console.libs.tasks
  */
 class ModelTaskTest extends CakeTestCase {
-	var $fixtures = array('core.datatype', 'core.binary_test');
+	var $fixtures = array('core.datatype', 'core.binary_test', 'core.article');
 /**
  * setUp method
  *
@@ -88,5 +88,23 @@ function testFixtureGeneration() {
 		$result = $this->Task->fixture('BinaryTest');
 		$this->assertPattern("/'data' => 'Lorem ipsum dolor sit amet'/", $result);
 	}
+/**
+ * test that execute passes runs bake depending with named model.
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeModel() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$filename = '/my/path/article.php';
+		$this->Task->setReturnValue('_checkUnitTest', 1);
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class Article extends AppModel/')));
+		$model =& new Model(array('name' => 'Article', 'table' => 'articles', 'ds' => 'test_suite'));
+		$this->Task->bake($model);
+
+		$this->assertEqual(count(ClassRegistry::keys()), 0);
+		$this->assertEqual(count(ClassRegistry::mapKeys()), 0);
+	}
 }
 ?>
\ No newline at end of file

From fc499ac48f9caa7e99d656f64c25b64d13348f98 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Tue, 16 Feb 2010 22:05:50 -0500
Subject: [PATCH 184/244] Reversing order of short cut checks.  Fixes issues in
 PHP 5.1.x.  Fixes #351

---
 cake/libs/model/datasources/dbo_source.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 5fd829efb..9f087946d 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -380,12 +380,12 @@ function field($name, $sql) {
  * @return string SQL field
  */
 	function name($data) {
-		if ($data == '*') {
-			return '*';
-		}
 		if (is_object($data) && isset($data->type)) {
 			return $data->value;
 		}
+		if ($data == '*') {
+			return '*';
+		}
 		$array = is_array($data);
 		$data = (array)$data;
 		$count = count($data);

From 63f7900ba1647e2111b85d9445d3973f746f93f5 Mon Sep 17 00:00:00 2001
From: "renan.saddam" <renan.saddam@gmail.com>
Date: Wed, 17 Feb 2010 22:31:00 -0300
Subject: [PATCH 185/244] Checking if the last query returned a error, tests
 added. Fixes #72.

---
 cake/libs/model/datasources/dbo/dbo_mssql.php | 18 +++++++++----
 .../model/datasources/dbo/dbo_mssql.test.php  | 25 +++++++++++++++++++
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index 9b2912bfd..9e08bd190 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -99,6 +99,13 @@ class DboMssql extends DboSource {
 		'commit'   => 'COMMIT',
 		'rollback' => 'ROLLBACK'
 	);
+/**
+ * Define if the last query had error
+ *
+ * @var string
+ * @access private
+ */
+	var $__lastQueryHadError = false;
 /**
  * MS SQL DBO driver constructor; sets SQL Server error reporting defaults
  *
@@ -177,7 +184,9 @@ function disconnect() {
  * @access protected
  */
 	function _execute($sql) {
-		return mssql_query($sql, $this->connection);
+		$result = @mssql_query($sql, $this->connection);
+		$this->__lastQueryHadError = ($result === false);
+		return $result;
 	}
 /**
  * Returns an array of sources (tables) in the database.
@@ -411,10 +420,9 @@ function update(&$model, $fields = array(), $values = null, $conditions = null)
  * @return string Error message with error number
  */
 	function lastError() {
-		$error = mssql_get_last_message();
-
-		if ($error) {
-			if (!preg_match('/contexto de la base de datos a|contesto di database|changed database|contexte de la base de don|datenbankkontext/i', $error)) {
+		if ($this->__lastQueryHadError) {
+			$error = mssql_get_last_message();
+			if ($error && !preg_match('/contexto de la base de datos a|contesto di database|changed database|contexte de la base de don|datenbankkontext/i', $error)) {
 				return $error;
 			}
 		}
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
index 7ea712a42..cfc5440d6 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
@@ -627,5 +627,30 @@ function testInsertMulti() {
 		);
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * testLastError
+ *
+ * @return void
+ * @access public
+ */
+	function testLastError() {
+		$debug = Configure::read('debug');
+		Configure::write('debug', 0);
+
+		$this->db->simulate = false;
+		$query = 'SELECT [name] FROM [categories]';
+		$this->assertTrue($this->db->execute($query) !== false);
+		$this->assertNull($this->db->lastError());
+
+		$query = 'SELECT [inexistent_field] FROM [categories]';
+		$this->assertFalse($this->db->execute($query));
+		$this->assertNotNull($this->db->lastError());
+
+		$query = 'SELECT [name] FROM [categories]';
+		$this->assertTrue($this->db->execute($query) !== false);
+		$this->assertNull($this->db->lastError());
+
+		Configure::write('debug', $debug);
+	}
 }
 ?>
\ No newline at end of file

From ab688b88f408132a272b71b1c93dbb8ec42fcbad Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Wed, 17 Feb 2010 22:21:48 -0500
Subject: [PATCH 186/244] Adding test to check that postfix and prefix options
 don't go into inner objects.  Tests added, fixes #348

---
 cake/libs/view/helpers/javascript.php                  | 5 ++++-
 cake/tests/cases/libs/view/helpers/javascript.test.php | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index 3e07ef9bd..ec66579aa 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -632,7 +632,10 @@ function object($data = array(), $options = array(), $prefix = null, $postfix =
 
 			foreach ($data as $key => $val) {
 				if (is_array($val) || is_object($val)) {
-					$val = $this->object($val, array_merge($options, array('block' => false)));
+					$val = $this->object(
+						$val,
+						array_merge($options, array('block' => false, 'prefix' => '', 'postfix' => ''))
+					);
 				} else {
 					$quoteStrings = (
 						!count($options['stringKeys']) ||
diff --git a/cake/tests/cases/libs/view/helpers/javascript.test.php b/cake/tests/cases/libs/view/helpers/javascript.test.php
index e9bffea7a..83c1b74d0 100644
--- a/cake/tests/cases/libs/view/helpers/javascript.test.php
+++ b/cake/tests/cases/libs/view/helpers/javascript.test.php
@@ -392,6 +392,13 @@ function testObjectGeneration() {
 			$result = $this->Javascript->object($data);
 			$this->assertEqual($result, $expected);
 		}
+		
+		$object = array('title' => 'New thing', 'indexes' => array(5, 6, 7, 8), 'object' => array('inner' => array('value' => 1)));
+		$result = $this->Javascript->object($object, array('prefix' => 'PREFIX', 'postfix' => 'POSTFIX'));
+		$this->assertPattern('/^PREFIX/', $result);
+		$this->assertPattern('/POSTFIX$/', $result);
+		$this->assertNoPattern('/.PREFIX./', $result);
+		$this->assertNoPattern('/.POSTFIX./', $result);
 
 		if ($this->Javascript->useNative) {
 			$this->Javascript->useNative = false;

From f4c670e5be6bf6a9599d394669999fcadd01e4b1 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 20 Feb 2010 01:38:16 -0500
Subject: [PATCH 187/244] Fixing lack of space in meta tags lacking a link
 attribute. Fixes #371

---
 cake/libs/view/helpers/html.php                  | 2 +-
 cake/tests/cases/libs/view/helpers/html.test.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index de68c6861..3e8ff83fc 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -237,7 +237,7 @@ function meta($type, $url = null, $attributes = array(), $inline = true) {
 			}
 			$out .= sprintf($this->tags['metalink'], $attributes['link'], $this->_parseAttributes($attributes, array('link'), ' ', ' '));
 		} else {
-			$out = sprintf($this->tags['meta'], $this->_parseAttributes($attributes, array('type')));
+			$out = sprintf($this->tags['meta'], $this->_parseAttributes($attributes, array('type'), ' ', ' '));
 		}
 
 		if ($inline) {
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
index 2ade552ad..d6d3be54e 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -844,6 +844,8 @@ function testMeta() {
 
 		$result = $this->Html->meta('keywords', 'these, are, some, meta, keywords');
 		$this->assertTags($result, array('meta' => array('name' => 'keywords', 'content' => 'these, are, some, meta, keywords')));
+		$this->assertPattern('/\s+\/>$/', $result);
+
 
 		$result = $this->Html->meta('description', 'this is the meta description');
 		$this->assertTags($result, array('meta' => array('name' => 'description', 'content' => 'this is the meta description')));

From 763aa524b95f666d1a20d7e58b896f39d830dbd0 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 20 Feb 2010 11:25:46 -0500
Subject: [PATCH 188/244] Fixing recursive directory creation when nested
 create() calls fail. Fixes #347

---
 cake/libs/folder.php                  |  2 +-
 cake/tests/cases/libs/folder.test.php | 42 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/cake/libs/folder.php b/cake/libs/folder.php
index 05dd150b2..6b71be4e3 100644
--- a/cake/libs/folder.php
+++ b/cake/libs/folder.php
@@ -473,7 +473,7 @@ function create($pathname, $mode = false) {
 				}
 			}
 		}
-		return true;
+		return false;
 	}
 /**
  * Returns the size in bytes of this Folder.
diff --git a/cake/tests/cases/libs/folder.test.php b/cake/tests/cases/libs/folder.test.php
index ecdf13e99..a95555e54 100644
--- a/cake/tests/cases/libs/folder.test.php
+++ b/cake/tests/cases/libs/folder.test.php
@@ -82,6 +82,48 @@ function testInPath() {
 		$result = $Folder->inPath(DS . 'non-existing' . $inside);
 		$this->assertFalse($result);
 	}
+
+/**
+ * test creation of single and mulitple paths.
+ *
+ * @return void
+ */
+	function testCreation() {
+		$folder =& new Folder(TMP . 'tests');
+		$result = $folder->create(TMP . 'tests' . DS . 'first' . DS . 'second' . DS . 'third');
+		$this->assertTrue($result);
+
+		rmdir(TMP . 'tests' . DS . 'first' . DS . 'second' . DS . 'third');
+		rmdir(TMP . 'tests' . DS . 'first' . DS . 'second');
+		rmdir(TMP . 'tests' . DS . 'first');
+
+		$folder =& new Folder(TMP . 'tests');
+		$result = $folder->create(TMP . 'tests' . DS . 'first');
+		$this->assertTrue($result);
+		rmdir(TMP . 'tests' . DS . 'first');
+	}
+/**
+ * test recurisve directory create failure.
+ *
+ * @return void
+ */
+	function testRecursiveCreateFailure() {
+		if ($this->skipIf(DS == '\\', 'Cant perform operations using permissions on windows. %s')) {
+			return;
+		}
+		$path = TMP . 'tests' . DS . 'one';
+		mkdir($path);
+		chmod($path, '0444');
+
+		$this->expectError();
+
+		$folder =& new Folder($path);
+		$result = $folder->create($path . DS . 'two' . DS . 'three');
+		$this->assertFalse($result);
+
+		chmod($path, '0777');
+		rmdir($path);
+	}
 /**
  * testOperations method
  *

From 348fe6f57463aaa20d77984254f493d9ca4fe9f1 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Wed, 24 Feb 2010 22:45:49 -0500
Subject: [PATCH 189/244] Expanding documentation for FormHelper::submit() 
 Fixes #390

---
 cake/libs/view/helpers/form.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index bec46c6b9..0f81c320e 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -1097,11 +1097,17 @@ function button($title, $options = array()) {
 /**
  * Creates a submit button element.
  *
+ * ### Options
+ *
+ * - `div` - Include a wrapping div?  Defaults to true.  Accepts sub options similar to 
+ *   FormHelper::input().
+ * - Other attributes will be assigned to the input element.
+ *
  * @param string $caption The label appearing on the button OR if string contains :// or the
  *  extension .jpg, .jpe, .jpeg, .gif, .png use an image if the extension
  *  exists, AND the first character is /, image is relative to webroot,
  *  OR if the first character is not /, image is relative to webroot/img.
- * @param array $options 
+ * @param array $options Array of options.  See above.
  * @return string A HTML submit button
  */
 	function submit($caption = null, $options = array()) {

From af317a107bdb179bce31323d0d28af2c333ebc12 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Mon, 8 Mar 2010 23:07:36 -0500
Subject: [PATCH 190/244] Fixing issues in Set::combine() when data or paths
 used result in empty datasets.  Tests added. Fixes #414

---
 cake/libs/set.php                  | 7 ++++++-
 cake/tests/cases/libs/set.test.php | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cake/libs/set.php b/cake/libs/set.php
index fc921b26a..ed8e19c91 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -947,6 +947,9 @@ function combine($data, $path1 = null, $path2 = null, $groupPath = null) {
 		} else {
 			$keys = Set::extract($data, $path1);
 		}
+		if (empty($keys)) {
+			return array();
+		}
 
 		if (!empty($path2) && is_array($path2)) {
 			$format = array_shift($path2);
@@ -978,7 +981,9 @@ function combine($data, $path1 = null, $path2 = null, $groupPath = null) {
 				return $out;
 			}
 		}
-
+		if (empty($vals)) {
+			return array();
+		}
 		return array_combine($keys, $vals);
 	}
 /**
diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index a42d0cc9e..6867ae4f1 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -1621,6 +1621,9 @@ function testCombine() {
 		$result = Set::combine($b, 'users.{n}.User.id', 'users.{n}.User.non-existant');
 		$expected = array(2 => null, 14 => null, 25 => null);
 		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, 'fail', 'fail');
+		$this->assertEqual($result, array());
 	}
 /**
  * testMapReverse method

From 64c627a35241cf9766a035fc02cdd78a908755ef Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Wed, 10 Mar 2010 21:46:28 -0500
Subject: [PATCH 191/244] Adding checks to force limit to always be a positive
 integer.  Fixes potential out of bounds type queries with paginate().  Fixes
 #418

---
 cake/libs/controller/controller.php                  | 7 ++++++-
 cake/tests/cases/libs/controller/controller.test.php | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 16524a986..a7e5a9722 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -1046,8 +1046,13 @@ function paginate($object = null, $scope = array(), $whitelist = array()) {
 			$type = $defaults[0];
 			unset($defaults[0]);
 		}
+
 		$options = array_merge(array('page' => 1, 'limit' => 20), $defaults, $options);
-		$options['limit'] = (empty($options['limit']) || !is_numeric($options['limit'])) ? 1 : $options['limit'];
+		$options['limit'] = (int) $options['limit'];
+		if (empty($options['limit']) || $options['limit'] < 1) {
+			$options['limit'] = 1;
+		}
+
 		extract($options);
 
 		if (is_array($scope) && !empty($scope)) {
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index 1b06f487a..e65a639fa 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -526,6 +526,14 @@ function testPaginate() {
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['pageCount'], 3);
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['prevPage'], false);
 		$this->assertIdentical($Controller->params['paging']['ControllerPost']['nextPage'], true);
+
+		$Controller->passedArgs = array();
+		$Controller->paginate = array('limit' => '-1');
+		$Controller->paginate('ControllerPost');
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['pageCount'], 3);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['prevPage'], false);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['nextPage'], true);
 	}
 /**
  * testPaginateExtraParams method

From 8d58b40642c182afe307d00debf44a1dbd8a3c62 Mon Sep 17 00:00:00 2001
From: Mariano Iglesias <mariano@cricava.com>
Date: Sun, 14 Mar 2010 16:34:57 -0300
Subject: [PATCH 192/244] Fixing issue in Containable where if bindModel was
 used to add / change a binding not permanently, Containable was making the
 change permanent

---
 cake/libs/model/behaviors/containable.php     |  6 ++++-
 .../libs/model/behaviors/containable.test.php | 25 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php
index 7aa02f55e..8ace8760f 100644
--- a/cake/libs/model/behaviors/containable.php
+++ b/cake/libs/model/behaviors/containable.php
@@ -129,7 +129,11 @@ function beforeFind(&$Model, $query) {
 			if ($contain) {
 				$backupBindings = array();
 				foreach ($this->types as $relation) {
-					$backupBindings[$relation] = $instance->{$relation};
+					if (!empty($instance->__backAssociation[$relation])) {
+						$backupBindings[$relation] = $instance->__backAssociation[$relation];
+					} else {
+						$backupBindings[$relation] = $instance->{$relation};
+					}
 				}
 				foreach ($this->types as $type) {
 					$unbind = array();
diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index ebfa57a54..a2a6fdc71 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -3311,6 +3311,31 @@ function testOriginalAssociations() {
 		$this->assertTrue(Set::matches('/Comment[article_id=1]', $result));
 		$this->Article->resetBindings();
 	}
+/**
+ * testResetAddedAssociation method
+ *
+ * @access public
+ */
+	function testResetAddedAssociation() {
+		$this->assertTrue(empty($this->Article->hasMany['ArticlesTag']));
+
+		$this->Article->bindModel(array(
+			'hasMany' => array('ArticlesTag')
+		));
+		$this->assertTrue(!empty($this->Article->hasMany['ArticlesTag']));
+
+		$result = $this->Article->find('first', array(
+			'conditions' => array('Article.id' => 1),
+			'contain' => array('ArticlesTag')
+		));
+		$expected = array('Article', 'ArticlesTag');
+		$this->assertTrue(!empty($result));
+		$this->assertEqual('First Article', $result['Article']['title']);
+		$this->assertTrue(!empty($result['ArticlesTag']));
+		$this->assertEqual($expected, array_keys($result));
+
+		$this->assertTrue(empty($this->Article->hasMany['ArticlesTag']));
+	}
 /**
  * testResetAssociation method
  *

From 3ab687043e57130cbee76ead4ad7865478da718b Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sun, 14 Mar 2010 19:27:36 -0400
Subject: [PATCH 193/244] Updating DboPostgres test to reflect changes in test
 suite.

---
 .../datasources/dbo/dbo_postgres.test.php      | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
index e7d2de630..bfd375d77 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
@@ -157,7 +157,8 @@ class DboPostgresTest extends CakeTestCase {
  * @access public
  */
 	var $fixtures = array('core.user', 'core.binary_test', 'core.comment', 'core.article',
-		'core.tag', 'core.articles_tag', 'core.attachment', 'core.person', 'core.post', 'core.author');
+		'core.tag', 'core.articles_tag', 'core.attachment', 'core.person', 'core.post', 'core.author',
+	);
 /**
  * Actual DB connection used in testing
  *
@@ -477,16 +478,23 @@ function testCakeSchema() {
 		)');
 		$model =& ClassRegistry::init('datatypes');
 		$schema = new CakeSchema(array('connection' => 'test_suite'));
-		$result = $schema->read(array('connection' => 'test_suite'));
-		$schema->tables = $result['tables']['missing'];
+		$result = $schema->read(array(
+			'connection' => 'test_suite',
+			'models' => array('Datatype')
+		));
+		$schema->tables = array('datatypes' => $result['tables']['datatypes']);
 		$result = $db1->createSchema($schema, 'datatypes');
 		$this->assertNoPattern('/timestamp DEFAULT/', $result);
 		$this->assertPattern('/timestamp\s*,/', $result);
 
 		$db1->query('DROP TABLE ' . $db1->fullTableName('datatypes'));
+
 		$db1->query($result);
-		$result2 = $schema->read(array('connection' => 'test_suite'));
-		$schema->tables = $result2['tables']['missing'];
+		$result2 = $schema->read(array(
+			'connection' => 'test_suite',
+			'models' => array('Datatype')
+		));
+		$schema->tables = array('datatypes' => $result2['tables']['datatypes']);
 		$result2 = $db1->createSchema($schema, 'datatypes');
 		$this->assertEqual($result, $result2);
 

From daf02cad61a0979fe6cf85b0aa4e5f2d68a03c2b Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sun, 14 Mar 2010 23:31:52 -0400
Subject: [PATCH 194/244] Fixing CakeSchema index comparison that was causing
 failures in postgres tests.

---
 cake/libs/model/schema.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/cake/libs/model/schema.php b/cake/libs/model/schema.php
index 30c1a37da..db68169b1 100644
--- a/cake/libs/model/schema.php
+++ b/cake/libs/model/schema.php
@@ -372,7 +372,7 @@ function write($object, $options = array()) {
  */
 	function compare($old, $new = null) {
 		if (empty($new)) {
-			$new = $this;
+			$new =& $this;
 		}
 		if (is_array($new)) {
 			if (isset($new['tables'])) {
@@ -406,6 +406,7 @@ function compare($old, $new = null) {
 					$tables[$table]['drop'] = $diff;
 				}
 			}
+
 			foreach ($fields as $field => $value) {
 				if (isset($old[$table][$field])) {
 					$diff = array_diff_assoc($value, $old[$table][$field]);
@@ -427,10 +428,13 @@ function compare($old, $new = null) {
 			if (isset($old[$table]['indexes']) && isset($new[$table]['indexes'])) {
 				$diff = $this->_compareIndexes($new[$table]['indexes'], $old[$table]['indexes']);
 				if ($diff) {
-					if (isset($tables[$table]['drop']['indexes']) && isset($diff['drop'])) {
+					if (!isset($tables[$table])) {
+						$tables[$table] = array();
+					}
+					if (isset($diff['drop'])) {
 						$tables[$table]['drop']['indexes'] = $diff['drop'];
 					}
-					if (isset($tables[$table]['add']['indexes']) && isset($diff['add'])) {
+					if ($diff && isset($diff['add'])) {
 						$tables[$table]['add']['indexes'] = $diff['add'];
 					}
 				}

From 190066fd51c222de91989aec97b0042d7bcda7c9 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Mon, 15 Mar 2010 22:15:03 -0400
Subject: [PATCH 195/244] Adding array_filter() to remove empty conditions that
 can be caused by array casting an empty string.

---
 cake/libs/model/model.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index d76510fc8..c0ad6aaa1 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1370,10 +1370,10 @@ function __saveMulti($joined, $id) {
 				}
 
 				if ($this->hasAndBelongsToMany[$assoc]['unique']) {
-					$conditions = array_merge(
+					$conditions = array_filter(array_merge(
 						array($join . '.' . $this->hasAndBelongsToMany[$assoc]['foreignKey'] => $id),
 						(array)$this->hasAndBelongsToMany[$assoc]['conditions']
-					);
+					));
 					$links = $this->{$join}->find('all', array(
 						'conditions' => $conditions,
 						'recursive' => empty($this->hasAndBelongsToMany[$assoc]['conditions']) ? -1 : 0,
@@ -1397,7 +1397,7 @@ function __saveMulti($joined, $id) {
 				}
 
 				if (!empty($newValues)) {
-					$fields =  implode(',', $fields);
+					$fields = implode(',', $fields);
 					$db->insertMulti($this->{$join}, $fields, $newValues);
 				}
 			}

From ea64588a814b09565b82c428845f7a096814c327 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Mon, 15 Mar 2010 22:55:14 -0400
Subject: [PATCH 196/244] Adding tests from 'Stephen Cuppert' to test
 incorrectly generate DELETE queries for habtm join tables that do not have a
 primary key when using PostgreSQL.  Updating DboSource::_matchRecords() to
 only query the table if the supplied conditions are actually multi-table
 conditions. Fixes #459

---
 cake/libs/model/datasources/dbo_source.php    | 16 ++++++
 .../cases/libs/model/model_delete.test.php    | 55 +++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 9f087946d..5982e137d 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -1477,6 +1477,22 @@ function _matchRecords(&$model, $conditions = null) {
 		} elseif ($conditions === null) {
 			$conditions = $this->conditions($this->defaultConditions($model, $conditions, false), true, true, $model);
 		} else {
+			$noJoin = true;
+			foreach ($conditions as $field => $value) {
+				$originalField = $field;
+				if (strpos($field, '.') !== false) {
+					list($alias, $field) = explode('.', $field);
+				}
+				if (!$model->hasField($field)) {
+					$noJoin = false;
+					break;
+				}
+				$conditions[$field] = $value;
+				unset($conditions[$originalField]);
+			}
+			if ($noJoin === true) {
+				return $this->conditions($conditions);
+			}
 			$idList = $model->find('all', array(
 				'fields' => "{$model->alias}.{$model->primaryKey}",
 				'conditions' => $conditions
diff --git a/cake/tests/cases/libs/model/model_delete.test.php b/cake/tests/cases/libs/model/model_delete.test.php
index e2d4874f8..d299cc905 100644
--- a/cake/tests/cases/libs/model/model_delete.test.php
+++ b/cake/tests/cases/libs/model/model_delete.test.php
@@ -580,6 +580,61 @@ function testBeforeDeleteDeleteAbortion() {
 		$exists = $Model->findById(1);
 		$this->assertTrue(is_array($exists));
 	}
+/**
+ * test for a habtm deletion error that occurs in postgres but should not.
+ * And should not occur in any dbo.
+ *
+ * @return void
+ */
+	function testDeleteHabtmPostgresFailure() {
+		$this->loadFixtures('Article', 'Tag', 'ArticlesTag');
+
+		$Article =& ClassRegistry::init('Article');
+		$Article->hasAndBelongsToMany['Tag']['unique'] = true;
+
+		$Tag =& ClassRegistry::init('Tag');
+		$Tag->bindModel(array('hasAndBelongsToMany' => array(
+			'Article' => array(
+				'className' => 'Article',
+				'unique' => true
+			)
+		)), true);
+
+		// Article 1 should have Tag.1 and Tag.2
+	    $before = $Article->find("all", array(
+			"conditions" => array("Article.id" => 1),
+		));
+		$this->assertEqual(count($before[0]['Tag']), 2, 'Tag count for Article.id = 1 is incorrect, should be 2 %s');
+
+		// From now on, Tag #1 is only associated with Post #1
+		$submitted_data = array(
+			"Tag" => array("id" => 1, 'tag' => 'tag1'),
+			"Article" => array(
+				"Article" => array(1)
+			)
+		);
+		$Tag->save($submitted_data);
+
+	    // One more submission (The other way around) to make sure the reverse save looks good.
+	    $submitted_data = array(
+			"Article" => array("id" => 2, 'title' => 'second article'),
+			"Tag" => array(
+				"Tag" => array(2, 3)
+			)
+		);
+	    // ERROR:
+	    // Postgresql: DELETE FROM "articles_tags" WHERE tag_id IN ('1', '3')
+	    // MySQL: DELETE `ArticlesTag` FROM `articles_tags` AS `ArticlesTag` WHERE `ArticlesTag`.`article_id` = 2 AND `ArticlesTag`.`tag_id` IN (1, 3)
+	    $Article->save($submitted_data);
+
+		// Want to make sure Article #1 has Tag #1 and Tag #2 still.
+		$after = $Article->find("all", array(
+			"conditions" => array("Article.id" => 1),
+		));
+
+		// Removing Article #2 from Tag #1 is all that should have happened.
+		$this->assertEqual(count($before[0]["Tag"]), count($after[0]["Tag"]));
+	}
 }
 
 ?>
\ No newline at end of file

From 661fcd32ab56b3c288c922c570ea141461d794ba Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Mon, 15 Mar 2010 23:07:18 -0400
Subject: [PATCH 197/244] Fixing failing tests in PostgreSQL cause by invalid
 datatype comparisons and missing id fields.

---
 cake/tests/cases/libs/model/model_write.test.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
index f57dc0eb4..b43b0facf 100644
--- a/cake/tests/cases/libs/model/model_write.test.php
+++ b/cake/tests/cases/libs/model/model_write.test.php
@@ -322,6 +322,7 @@ function testCacheClearOnSave() {
 
 		$data = array(
 			'OverallFavorite' => array(
+				'id' => 22,
 		 		'model_type' => '8-track',
 				'model_id' => '3',
 				'priority' => '1'
@@ -383,6 +384,7 @@ function testCounterCacheIncrease() {
 		$User = new CounterCacheUser();
 		$Post = new CounterCachePost();
 		$data = array('Post' => array(
+			'id' => 22,
 			'title' => 'New Post',
 			'user_id' => 66
 		));
@@ -2007,7 +2009,7 @@ function testHabtmSaveWithConditionsInAssociation() {
 				'DoomedSomethingElse' => array(
 					'className' => 'SomethingElse',
 					'joinTable' => 'join_things',
-					'conditions' => 'JoinThing.doomed = 1',
+					'conditions' => 'JoinThing.doomed = true',
 					'unique' => true
 				),
 				'NotDoomedSomethingElse' => array(

From 01a5738f3c7f8553d8203eb565c08beba6e79ca0 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Mon, 15 Mar 2010 23:14:23 -0400
Subject: [PATCH 198/244]  Effectively reverting changes made in
 [190066fd51c222de91989aec97b0042d7bcda7c9] which caused conditions using a
 falsey values to be removed.

---
 cake/libs/model/model.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index c0ad6aaa1..184a75fee 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1370,10 +1370,12 @@ function __saveMulti($joined, $id) {
 				}
 
 				if ($this->hasAndBelongsToMany[$assoc]['unique']) {
-					$conditions = array_filter(array_merge(
-						array($join . '.' . $this->hasAndBelongsToMany[$assoc]['foreignKey'] => $id),
-						(array)$this->hasAndBelongsToMany[$assoc]['conditions']
-					));
+					$conditions = array(
+						$join . '.' . $this->hasAndBelongsToMany[$assoc]['foreignKey'] => $id
+					);
+					if (!empty($this->hasAndBelongsToMany[$assoc]['conditions'])) {
+						$conditions = array_merge($conditions, (array)$this->hasAndBelongsToMany[$assoc]['conditions']);
+					}
 					$links = $this->{$join}->find('all', array(
 						'conditions' => $conditions,
 						'recursive' => empty($this->hasAndBelongsToMany[$assoc]['conditions']) ? -1 : 0,

From bc990f41e3d29db70cf5c181a11668c8e63f4bdf Mon Sep 17 00:00:00 2001
From: AD7six <andydawson76@yahoo.co.uk>
Date: Mon, 15 Mar 2010 11:55:47 +0100
Subject: [PATCH 199/244] Prevent sql error for uuids if id is specified as
 null

if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/libs/model/model.php                     |  7 +++++-
 .../cases/libs/model/model_write.test.php     | 23 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 184a75fee..f3c26e01a 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1273,7 +1273,12 @@ function save($data = null, $validate = true, $fieldList = array()) {
 							($fInfo['type'] === 'string' || $fInfo['type'] === 'binary')
 						);
 						if (empty($this->data[$this->alias][$this->primaryKey]) && $isUUID) {
-							list($fields[], $values[]) = array($this->primaryKey, String::uuid());
+							if (array_key_exists($this->primaryKey, $this->data[$this->alias])) {
+								$j = array_search($this->primaryKey, $fields);
+								$values[$j] = String::uuid();
+							} else {
+								list($fields[], $values[]) = array($this->primaryKey, String::uuid());
+							}
 						}
 						break;
 					}
diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
index b43b0facf..2cc0326f3 100644
--- a/cake/tests/cases/libs/model/model_write.test.php
+++ b/cake/tests/cases/libs/model/model_write.test.php
@@ -161,6 +161,29 @@ function testAutoSaveUuid() {
 		);
 		$this->assertEqual(strlen($result['Uuid']['id']), 36);
 	}
+/**
+ * Ensure that if the id key is null but present the save doesn't fail (with an
+ * x sql error: "Column id specified twice")
+ *
+ * @return void
+ * @access public
+ */
+	function testSaveUuidNull() {
+		// SQLite does not support non-integer primary keys
+		$this->skipIf($this->db->config['driver'] == 'sqlite');
+
+		$this->loadFixtures('Uuid');
+		$TestModel =& new Uuid();
+
+		$TestModel->save(array('title' => 'Test record', 'id' => null));
+		$result = $TestModel->findByTitle('Test record');
+		$this->assertEqual(
+			array_keys($result['Uuid']),
+			array('id', 'title', 'count', 'created', 'updated')
+		);
+		$this->assertEqual(strlen($result['Uuid']['id']), 36);
+	}
+
 /**
  * testZeroDefaultFieldValue method
  *

From 28cb57a92c54a223fed4aacc738db5ccc8bc71c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Lorenzo=20Rodr=C3=ADguez?= <jose.zap@gmail.com>
Date: Wed, 17 Mar 2010 10:32:36 -0430
Subject: [PATCH 200/244] Fixing bug in Model::escapeField() where it would
 return the wrong string id the datasource's name method returs the unmodified
 string. Tests added. Closes #473

---
 cake/libs/model/model.php                     |  2 +-
 .../libs/model/model_integration.test.php     | 52 +++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index f3c26e01a..12de7f31f 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -2631,7 +2631,7 @@ function escapeField($field = null, $alias = null) {
 			$field = $this->primaryKey;
 		}
 		$db =& ConnectionManager::getDataSource($this->useDbConfig);
-		if (strpos($field, $db->name($alias)) === 0) {
+		if (strpos($field, $db->name($alias) . '.') === 0) {
 			return $field;
 		}
 		return $db->name($alias . '.' . $field);
diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php
index 3da333592..85de2ed96 100644
--- a/cake/tests/cases/libs/model/model_integration.test.php
+++ b/cake/tests/cases/libs/model/model_integration.test.php
@@ -24,6 +24,27 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 require_once dirname(__FILE__) . DS . 'model.test.php';
+App::import('Core', 'DboSource');
+
+/**
+ * DboMock class
+ * A Dbo Source driver to mock a connection and a identity name() method
+ */
+class DboMock extends DboSource {
+
+/**
+* Returns the $field without modifications
+*/
+	function name($field) {
+		return $field;
+	}
+/**
+* Returns true to fake a database connection
+*/
+	function connect() {
+		return true;
+	}
+}
 
 /**
  * ModelIntegrationTest
@@ -1831,5 +1852,36 @@ function testCreation() {
 		$this->assertEqual($FeaturedModel->create($data), $expected);
 	}
 
+/**
+ * testEscapeField to prove it escapes the field well even when it has part of the alias on it
+ * @see ttp://cakephp.lighthouseapp.com/projects/42648-cakephp-1x/tickets/473-escapefield-doesnt-consistently-prepend-modelname
+ *
+ * @access public
+ * @return void
+ */
+	function testEscapeField() {
+		$TestModel =& new Test();
+		$db =& $TestModel->getDataSource();
+
+		$result = $TestModel->escapeField('test_field');
+		$expected = $db->name('Test.test_field');
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->escapeField('TestField');
+		$expected = $db->name('Test.TestField');
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->escapeField('DomainHandle', 'Domain');
+		$expected = $db->name('Domain.DomainHandle');
+		$this->assertEqual($result, $expected);
+
+		ConnectionManager::create('mock', array('driver' => 'mock'));
+		$TestModel->setDataSource('mock');
+		$db =& $TestModel->getDataSource();
+
+		$result = $TestModel->escapeField('DomainHandle', 'Domain');
+		$expected = $db->name('Domain.DomainHandle');
+		$this->assertEqual($result, $expected);
+	}
 }
 ?>
\ No newline at end of file

From c3aec39d75a944c2105adbaba286049e03311f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Lorenzo=20Rodr=C3=ADguez?= <jose.zap@gmail.com>
Date: Wed, 17 Mar 2010 10:47:03 -0430
Subject: [PATCH 201/244] Chaging array_push call for array_merge, as the first
 one would produce worng nested arrays in MediaView. closes #391

---
 cake/libs/view/media.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/view/media.php b/cake/libs/view/media.php
index 71c4e43a2..f50217d8f 100644
--- a/cake/libs/view/media.php
+++ b/cake/libs/view/media.php
@@ -148,7 +148,7 @@ function render() {
 					$contentTypes[0] = 'application/octetstream';
 				} else if (preg_match('/MSIE ([0-9].[0-9]{1,2})/', $agent)) {
 					$contentTypes[0] = 'application/force-download';
-					array_push($contentTypes, array(
+					array_merge($contentTypes, array(
 						'application/octet-stream',
 						'application/download'
 					));

From f65cb31cbea30b551369689990a1f0d78af0cc84 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Fri, 19 Mar 2010 20:44:18 -0400
Subject: [PATCH 202/244] Updating documentation for Router::normalize(). Refs
 #486

---
 cake/libs/router.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cake/libs/router.php b/cake/libs/router.php
index 51d452cec..1569ba359 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -1180,9 +1180,11 @@ function queryString($q, $extra = array(), $escape = false) {
 		return $out;
 	}
 /**
- * Normalizes a URL for purposes of comparison
+ * Normalizes a URL for purposes of comparison.  Will strip the base path off
+ * and replace any double /'s.  It will not unify the casing and underscoring
+ * of the input value.
  *
- * @param mixed $url URL to normalize
+ * @param mixed $url URL to normalize Either an array or a string url.
  * @return string Normalized URL
  * @access public
  */

From 6c8ce984aad2fa830da219cd2665c378cecec340 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 20 Mar 2010 18:15:52 -0400
Subject: [PATCH 203/244] Adding import for String to ensure that String has
 been loaded when Security component is used without making any database
 connections.  Fixes #482

---
 cake/libs/controller/components/security.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index f702c194a..e49f69966 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -23,6 +23,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+App::import('Core', 'String');
 /**
  * Short description for file.
  *

From 9d3f2fb4a757e0cccbb590a5062dc4a29dff13e4 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Wed, 24 Mar 2010 22:33:51 -0400
Subject: [PATCH 204/244] Moving Non-Zero tests for Set::extract() into a
 separate method.

---
 cake/tests/cases/libs/set.test.php | 114 ++++++++++++++++-------------
 1 file changed, 62 insertions(+), 52 deletions(-)

diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index 6867ae4f1..19dbc9968 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -417,43 +417,15 @@ function testExtract() {
 			array('a' => array('II' => array('a' => 3, 'III' => array('a' => array('foo' => 4))))),
 		);
 
-		$nonSequential = array(
-			'User' => array(
-				0  => array('id' => 1),
-				2  => array('id' => 2),
-				6  => array('id' => 3),
-				9  => array('id' => 4),
-				3  => array('id' => 5),
-			),
-		);
-
-		$nonZero = array(
-			'User' => array(
-				2  => array('id' => 1),
-				4  => array('id' => 2),
-				6  => array('id' => 3),
-				9  => array('id' => 4),
-				3  => array('id' => 5),
-			),
-		);
-
 		$expected = array(array('a' => $c[2]['a']));
 		$r = Set::extract('/a/II[a=3]/..', $c);
 		$this->assertEqual($r, $expected);
 
 		$expected = array(1, 2, 3, 4, 5);
 		$this->assertEqual(Set::extract('/User/id', $a), $expected);
-		$this->assertEqual(Set::extract('/User/id', $nonSequential), $expected);
-
-		$result = Set::extract('/User/id', $nonZero);
-		$this->assertEqual($result, $expected, 'Failed non zero array key extract');
 
 		$expected = array(1, 2, 3, 4, 5);
 		$this->assertEqual(Set::extract('/User/id', $a), $expected);
-		$this->assertEqual(Set::extract('/User/id', $nonSequential), $expected);
-
-		$result = Set::extract('/User/id', $nonZero);
-		$this->assertEqual($result, $expected, 'Failed non zero array key extract');
 
 		$expected = array(
 			array('id' => 1), array('id' => 2), array('id' => 3), array('id' => 4), array('id' => 5)
@@ -549,30 +521,6 @@ function testExtract() {
 		$r = Set::extract('/User/@*', $tricky);
 		$this->assertEqual($r, $expected);
 
-		$nonZero = array(
-			1 => array(
-				'User' => array(
-					'id' => 1,
-					'name' => 'John',
-				)
-			),
-			2 => array(
-				'User' => array(
-					'id' => 2,
-					'name' => 'Bob',
-				)
-			),
-			3 => array(
-				'User' => array(
-					'id' => 3,
-					'name' => 'Tony',
-				)
-			)
-		);
-		$expected = array(1, 2, 3);
-		$r = Set::extract('/User/id', $nonZero);
-		$this->assertEqual($r, $expected);
-
 		$common = array(
 			array(
 				'Article' => array(
@@ -1026,6 +974,68 @@ function testExtract() {
 		$expected = array('Second');
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * test that extract() still works when arrays don't contain a 0 index.
+ *
+ * @return void
+ */
+	function testExtractWithNonZeroArrays() {
+		$nonZero = array(
+			1 => array(
+				'User' => array(
+					'id' => 1,
+					'name' => 'John',
+				)
+			),
+			2 => array(
+				'User' => array(
+					'id' => 2,
+					'name' => 'Bob',
+				)
+			),
+			3 => array(
+				'User' => array(
+					'id' => 3,
+					'name' => 'Tony',
+				)
+			)
+		);
+		$expected = array(1, 2, 3);
+		$r = Set::extract('/User/id', $nonZero);
+		$this->assertEqual($r, $expected);
+		
+		$nonSequential = array(
+			'User' => array(
+				0  => array('id' => 1),
+				2  => array('id' => 2),
+				6  => array('id' => 3),
+				9  => array('id' => 4),
+				3  => array('id' => 5),
+			),
+		);
+
+		$nonZero = array(
+			'User' => array(
+				2  => array('id' => 1),
+				4  => array('id' => 2),
+				6  => array('id' => 3),
+				9  => array('id' => 4),
+				3  => array('id' => 5),
+			),
+		);
+
+		$expected = array(1, 2, 3, 4, 5);
+		$this->assertEqual(Set::extract('/User/id', $nonSequential), $expected);
+
+		$result = Set::extract('/User/id', $nonZero);
+		$this->assertEqual($result, $expected, 'Failed non zero array key extract');
+
+		$expected = array(1, 2, 3, 4, 5);
+		$this->assertEqual(Set::extract('/User/id', $nonSequential), $expected);
+
+		$result = Set::extract('/User/id', $nonZero);
+		$this->assertEqual($result, $expected, 'Failed non zero array key extract');
+	}
 /**
  * testExtractWithArrays method
  * 

From e8e520d6f2114b2e954299ca95e7360f4d191535 Mon Sep 17 00:00:00 2001
From: Jimmy Bourassa <jbourassa@jbourassamb.local>
Date: Wed, 17 Mar 2010 00:09:27 -0400
Subject: [PATCH 205/244] Added test case for a bug in Set::extract

Signed-off-by: Mark Story <mark@mark-story.com>
---
 cake/tests/cases/libs/set.test.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index 19dbc9968..06632a796 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -973,6 +973,20 @@ function testExtract() {
 		$result = Set::extract('/ParentNode/name', $hasMany);
 		$expected = array('Second');
 		$this->assertEqual($result, $expected);
+		
+		$startingAtOne = array(
+			'Article' => array(
+				1=> array(
+					'id' => 1,
+					'approved' => 1,
+				),
+			)
+		);
+		
+		$expected = array(0 => array('Article' => array('id' => 1, 'approved' => 1)));
+		$result = Set::extract('/Article[approved=1]', $startingAtOne);
+		$this->assertEqual($result, $expected);
+
 	}
 /**
  * test that extract() still works when arrays don't contain a 0 index.

From cbb65ca85f514df59486b4ac02517d78b9c7e5a5 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Wed, 24 Mar 2010 22:36:38 -0400
Subject: [PATCH 206/244] Moving failing test into new method for non-zero
 array extraction.

---
 cake/tests/cases/libs/set.test.php | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index 06632a796..46c2dd597 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -973,20 +973,6 @@ function testExtract() {
 		$result = Set::extract('/ParentNode/name', $hasMany);
 		$expected = array('Second');
 		$this->assertEqual($result, $expected);
-		
-		$startingAtOne = array(
-			'Article' => array(
-				1=> array(
-					'id' => 1,
-					'approved' => 1,
-				),
-			)
-		);
-		
-		$expected = array(0 => array('Article' => array('id' => 1, 'approved' => 1)));
-		$result = Set::extract('/Article[approved=1]', $startingAtOne);
-		$this->assertEqual($result, $expected);
-
 	}
 /**
  * test that extract() still works when arrays don't contain a 0 index.
@@ -1049,6 +1035,19 @@ function testExtractWithNonZeroArrays() {
 
 		$result = Set::extract('/User/id', $nonZero);
 		$this->assertEqual($result, $expected, 'Failed non zero array key extract');
+		
+		$startingAtOne = array(
+			'Article' => array(
+				1=> array(
+					'id' => 1,
+					'approved' => 1,
+				),
+			)
+		);
+
+		$expected = array(0 => array('Article' => array('id' => 1, 'approved' => 1)));
+		$result = Set::extract('/Article[approved=1]', $startingAtOne);
+		$this->assertEqual($result, $expected);
 	}
 /**
  * testExtractWithArrays method

From 4f4d3f9ffe186ed5fde8c1b800903630e66b6113 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Wed, 24 Mar 2010 23:25:02 -0400
Subject: [PATCH 207/244] Fixing extraction of non-zero arrays with only one
 element and attribute selectors. Fixes #475

---
 cake/libs/set.php                  | 3 ++-
 cake/tests/cases/libs/set.test.php | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cake/libs/set.php b/cake/libs/set.php
index ed8e19c91..b6179de1c 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -438,7 +438,8 @@ function extract($path, $data = null, $options = array()) {
 						$items = array($items);
 					} elseif (!isset($items[0])) {
 						$current = current($items);
-						if ((is_array($current) && count($items) <= 1) || !is_array($current)) {
+						$currentKey = key($items);
+						if (!is_array($current) || (is_array($current) && count($items) <= 1 && !is_numeric($currentKey))) {
 							$items = array($items);
 						}
 					}
diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index 46c2dd597..349522ece 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -1035,10 +1035,10 @@ function testExtractWithNonZeroArrays() {
 
 		$result = Set::extract('/User/id', $nonZero);
 		$this->assertEqual($result, $expected, 'Failed non zero array key extract');
-		
+
 		$startingAtOne = array(
 			'Article' => array(
-				1=> array(
+				1 => array(
 					'id' => 1,
 					'approved' => 1,
 				),

From d95e482894927f8f9dbb80959d36a87d57467ed3 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Fri, 26 Mar 2010 10:46:48 +1100
Subject: [PATCH 208/244] Refs #332. Beginning fix for multiple session starts.

---
 cake/libs/session.php | 42 +++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/cake/libs/session.php b/cake/libs/session.php
index 8dbbdb78a..f44740648 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -116,6 +116,13 @@ class CakeSession extends Object {
  * @access public
  */
 	var $id = null;
+/**
+ * Session Started
+ *
+ * @var boolean
+ * @access public
+ */
+	var $started = false;
 /**
  * Constructor.
  *
@@ -163,16 +170,19 @@ function __construct($base = null, $start = true) {
 /**
  * Starts the Session.
  *
- * @param string $name Variable name to check for
- * @return boolean True if variable is there
+ * @return boolean True if session was started
  * @access public
  */
 	function start() {
+		if ($this->started) {
+			return true;
+		}
 		if (function_exists('session_write_close')) {
 			session_write_close();
 		}
 		$this->__initSession();
-		return $this->__startSession();
+		$this->started = $this->__startSession();
+		return $this->started;
 	}
 /**
  * Determine if Session has been started.
@@ -475,12 +485,13 @@ function __initSession() {
 						ini_set('session.auto_start', 0);
 					}
 				}
-				session_set_save_handler(array('CakeSession','__open'),
-													array('CakeSession', '__close'),
-													array('CakeSession', '__read'),
-													array('CakeSession', '__write'),
-													array('CakeSession', '__destroy'),
-													array('CakeSession', '__gc'));
+				session_set_save_handler(
+					array('CakeSession','__open'),
+					array('CakeSession', '__close'),
+					array('CakeSession', '__read'),
+					array('CakeSession', '__write'),
+					array('CakeSession', '__destroy'),
+					array('CakeSession', '__gc'));
 			break;
 			case 'php':
 				if (empty($_SESSION)) {
@@ -507,12 +518,13 @@ function __initSession() {
 						ini_set('session.cookie_path', $this->path);
 					}
 				}
-				session_set_save_handler(array('CakeSession','__open'),
-													array('CakeSession', '__close'),
-													array('Cache', 'read'),
-													array('Cache', 'write'),
-													array('Cache', 'delete'),
-													array('Cache', 'gc'));
+				session_set_save_handler(
+					array('CakeSession','__open'),
+					array('CakeSession', '__close'),
+					array('Cache', 'read'),
+					array('Cache', 'write'),
+					array('Cache', 'delete'),
+					array('Cache', 'gc'));
 			break;
 			default:
 				if (empty($_SESSION)) {

From 9740029e9e2db239c54f8db53d69046e04ef0dbe Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Fri, 26 Mar 2010 14:21:08 +1100
Subject: [PATCH 209/244] Fixes #332.

---
 cake/libs/session.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cake/libs/session.php b/cake/libs/session.php
index f44740648..d6a856392 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -120,9 +120,9 @@ class CakeSession extends Object {
  * Session Started
  *
  * @var boolean
- * @access public
+ * @access protected
  */
-	var $started = false;
+	var $_started = false;
 /**
  * Constructor.
  *
@@ -174,15 +174,15 @@ function __construct($base = null, $start = true) {
  * @access public
  */
 	function start() {
-		if ($this->started) {
+		if ($this->started()) {
 			return true;
 		}
 		if (function_exists('session_write_close')) {
 			session_write_close();
 		}
 		$this->__initSession();
-		$this->started = $this->__startSession();
-		return $this->started;
+		$this->_started = $this->__startSession();
+		return $this->started();
 	}
 /**
  * Determine if Session has been started.
@@ -191,7 +191,7 @@ function start() {
  * @return boolean True if session has been started.
  */
 	function started() {
-		if (isset($_SESSION)) {
+		if (isset($_SESSION) && $this->_started) {
 			return true;
 		}
 		return false;
@@ -223,7 +223,7 @@ function id($id = null) {
 			$this->id = $id;
 			session_id($this->id);
 		}
-		if (isset($_SESSION)) {
+		if ($this->started()) {
 			return session_id();
 		} else {
 			return $this->id;

From 9f5949ab5273048c76bf411d7c0057ba217d6132 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Fri, 26 Mar 2010 14:29:27 +1100
Subject: [PATCH 210/244] Fix for Session Component to use CakeSession
 started() checks. Refs #332.

---
 cake/libs/controller/components/session.php      | 16 ++++------------
 .../libs/controller/components/session.test.php  |  4 ++--
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/cake/libs/controller/components/session.php b/cake/libs/controller/components/session.php
index 5300ab6f4..7f8c2df55 100644
--- a/cake/libs/controller/components/session.php
+++ b/cake/libs/controller/components/session.php
@@ -43,13 +43,6 @@ class SessionComponent extends CakeSession {
  * @access private
  */
 	var $__active = true;
-/**
- * Used to determine if Session has been started
- *
- * @var boolean
- * @access private
- */
-	var $__started = false;
 /**
  * Used to determine if request are from an Ajax request
  *
@@ -89,7 +82,7 @@ function initialize(&$controller) {
  * @access public
  */
 	function startup(&$controller) {
-		if ($this->__started === false && $this->__active === true) {
+		if ($this->started() === false && $this->__active === true) {
 			$this->__start();
 		}
 	}
@@ -299,15 +292,14 @@ function id($id = null) {
  * @access private
  */
 	function __start() {
-		if ($this->__started === false) {
+		if ($this->started() === false) {
 			if (!$this->id() && parent::start()) {
-				$this->__started = true;
 				parent::_checkValid();
 			} else {
-				$this->__started = parent::start();
+				parent::start();
 			}
 		}
-		return $this->__started;
+		return $this->started();
 	}
 }
 
diff --git a/cake/tests/cases/libs/controller/components/session.test.php b/cake/tests/cases/libs/controller/components/session.test.php
index c87c9f6f0..b6115fe29 100644
--- a/cake/tests/cases/libs/controller/components/session.test.php
+++ b/cake/tests/cases/libs/controller/components/session.test.php
@@ -108,13 +108,13 @@ function testSessionAutoStart() {
 		Configure::write('Session.start', false);
 		$Session =& new SessionComponent();
 		$this->assertFalse($Session->__active);
-		$this->assertFalse($Session->__started);
+		$this->assertFalse($Session->started());
 		$Session->startup(new SessionTestController());
 
 		Configure::write('Session.start', true);
 		$Session =& new SessionComponent();
 		$this->assertTrue($Session->__active);
-		$this->assertFalse($Session->__started);
+		$this->assertFalse($Session->started());
 		$Session->startup(new SessionTestController());
 		$this->assertTrue(isset($_SESSION));
 

From ec3f4b8d34005d533d5d0f6d4003e65971a3e394 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Fri, 26 Mar 2010 19:59:09 +1100
Subject: [PATCH 211/244] Fixes #53, ordering of XML::toArray() operations.

---
 cake/libs/xml.php                  |  3 ++-
 cake/tests/cases/libs/xml.test.php | 37 ++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index ba37d5d96..4c2e03894 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -664,6 +664,7 @@ function toArray($camelize = true) {
 
 		foreach ($this->children as $child) {
 			$key = $camelize ? Inflector::camelize($child->name) : $child->name;
+			//debug($key);
 
 			if (is_a($child, 'XmlTextNode')) {
 				$out['value'] = $child->value;
@@ -688,7 +689,7 @@ function toArray($camelize = true) {
 				if (isset($out[$key]) || isset($multi[$key])) {
 					if (!isset($multi[$key])) {
 						$multi[$key] = array($out[$key]);
-						unset($out[$key]);
+						//unset($out[$key]);
 					}
 					$multi[$key][] = $value;
 				} elseif (!empty($value)) {
diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php
index bb71e1456..abcb7d0f4 100644
--- a/cake/tests/cases/libs/xml.test.php
+++ b/cake/tests/cases/libs/xml.test.php
@@ -1244,6 +1244,43 @@ function testToArray() {
 			)
 		);
 		$this->assertEqual($result, $expected);
+
+		$text = '<main><first label="first type node 1" /><first label="first type node 2" /><second label="second type node" /></main>';
+		$xml =  new Xml($text);
+		$result = $xml->toArray();
+		$expected = array(
+		    'Main' => array(
+		        'First' => array(
+		            array('label' => 'first type node 1'),
+		            array('label' => 'first type node 2')
+		        ),
+		        'Second' => array('label'=>'second type node')
+		    )
+		);
+		$this->assertIdentical($result,$expected);
+
+		$text = '<main><first label="first type node 1" /><first label="first type node 2" /><second label="second type node" /><collection><fifth label="fifth type node"/><third label="third type node 1"/><third label="third type node 2"/><third label="third type node 3"/><fourth label="fourth type node"/></collection></main>';
+		$xml =  new Xml($text);
+		$result = $xml->toArray();
+		$expected = array(
+		    'Main' => array(
+		        'First' => array(
+		            array('label' => 'first type node 1'),
+		            array('label' => 'first type node 2')
+		        ),
+		        'Second' => array('label'=>'second type node'),
+				'Collection' => array(
+					'Fifth' => array('label' => 'fifth type node'),
+					'Third' => array(
+						array('label' => 'third type node 1'),
+						array('label' => 'third type node 2'),
+						array('label' => 'third type node 3'),
+					),
+					'Fourth' => array('label' => 'fourth type node'),
+				)
+		    )
+		);
+		$this->assertIdentical($result,$expected);
 	}
 /**
  * testAppend method

From abefca759a0305b2d945b68aff312a067fa6390b Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Fri, 26 Mar 2010 22:51:58 +1100
Subject: [PATCH 212/244] Fix $host not being defined on SessionHelper.

---
 cake/libs/session.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cake/libs/session.php b/cake/libs/session.php
index d6a856392..a2568d157 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -123,6 +123,13 @@ class CakeSession extends Object {
  * @access protected
  */
 	var $_started = false;
+/**
+ * Hostname
+ *
+ * @var string
+ * @access public
+ */
+	var $host = null;
 /**
  * Constructor.
  *

From b559be58221537b220f4bfd1a127e4914e22a349 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 27 Mar 2010 12:48:31 -0400
Subject: [PATCH 213/244] Moving xml_parser_free() so parser resources are
 freed immediately after they are used.  Helps reduce memory consumption in
 Xml class.  Refs #505

---
 cake/libs/xml.php                  |  8 +++-----
 cake/tests/cases/libs/xml.test.php | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index 4c2e03894..1151e5880 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -664,7 +664,6 @@ function toArray($camelize = true) {
 
 		foreach ($this->children as $child) {
 			$key = $camelize ? Inflector::camelize($child->name) : $child->name;
-			//debug($key);
 
 			if (is_a($child, 'XmlTextNode')) {
 				$out['value'] = $child->value;
@@ -842,7 +841,7 @@ function __construct($input = null, $options = array()) {
 		parent::__construct('#document');
 
 		if ($options['root'] !== '#document') {
-			$Root = $this->createNode($options['root']);
+			$Root =& $this->createNode($options['root']);
 		} else {
 			$Root =& $this;
 		}
@@ -922,6 +921,8 @@ function parse() {
 				break;
 			}
 		}
+		xml_parser_free($this->__parser);
+		$this->__parser = null;
 		return true;
 	}
 /**
@@ -1089,9 +1090,6 @@ function header($attrib = array()) {
  * @access private
  */
 	function __destruct() {
-		if (is_resource($this->__parser)) {
-			xml_parser_free($this->__parser);
-		}
 		$this->_killParent(true);
 	}
 /**
diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php
index abcb7d0f4..8eca83c8d 100644
--- a/cake/tests/cases/libs/xml.test.php
+++ b/cake/tests/cases/libs/xml.test.php
@@ -1370,5 +1370,25 @@ function testNumericDataHandling() {
 		$result = $result[0]->first();
 		$this->assertEqual($result->value, '012345');
 	}
+
+/**
+ * test that creating an xml object does not leak memory
+ *
+ * @return void
+ */
+	function testMemoryLeakInConstructor() {
+		if ($this->skipIf(!function_exists('memory_get_usage'), 'Cannot test memory leaks without memory_get_usage')) {
+			return;
+		}
+		$data = '<?xml version="1.0" encoding="UTF-8"?><content>TEST</content>';
+		$start = memory_get_usage();
+		for ($i = 0; $i <= 300; $i++) {
+			$test =& new XML($data);
+			$test->__destruct();
+			unset($test);
+		}
+		$end = memory_get_usage();
+		$this->assertWithinMargin($start, $end, 3600, 'Memory leaked %s');
+	}
 }
 ?>
\ No newline at end of file

From 35446a42a92907e767442a433384472c40480763 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 27 Mar 2010 16:23:46 -0400
Subject: [PATCH 214/244] Making filtering of extracted arrays remember their
 key.  This fixes attribute selectors followed by parent selectors returning
 seemingly random results.  Fixes #502

---
 cake/libs/set.php                  |  2 +-
 cake/tests/cases/libs/set.test.php | 74 ++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/cake/libs/set.php b/cake/libs/set.php
index b6179de1c..64f55b0e6 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -486,7 +486,7 @@ function extract($path, $data = null, $options = array()) {
 					$length = count($matches);
 					foreach ($matches as $i => $match) {
 						if (Set::matches(array($condition), $match['item'], $i + 1, $length)) {
-							$filtered[] = $match;
+							$filtered[$i] = $match;
 						}
 					}
 					$matches = $filtered;
diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index 349522ece..8f983f4ec 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -974,6 +974,80 @@ function testExtract() {
 		$expected = array('Second');
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * test parent selectors with extract
+ *
+ * @return void
+ */
+	function testExtractParentSelector() {
+		$a = array(
+			'Model' => array(
+				'0' => array(
+					'id' => 18,
+					'SubModelsModel' => array(
+						'id' => 1,
+						'submodel_id' => 66,
+						'model_id' => 18,
+						'type' => 1
+					),
+				),
+				'1' => array(
+					'id' => 0,
+					'SubModelsModel' => array(
+						'id' => 2,
+						'submodel_id' => 66,
+						'model_id' => 0,
+						'type' => 1
+					),
+				),
+				'2' => array(
+					'id' => 17,
+					'SubModelsModel' => array(
+						'id' => 3,
+						'submodel_id' => 66,
+						'model_id' => 17,
+						'type' => 2
+					),
+				),
+				'3' => array(
+					'id' => 0,
+					'SubModelsModel' => array(
+						'id' => 4,
+						'submodel_id' => 66,
+						'model_id' => 0,
+						'type' => 2
+					)
+				)
+			)
+		);
+
+		$expected = array(
+			array(
+				'Model' => array(
+					'id' => 17,
+					'SubModelsModel' => array(
+						'id' => 3,
+						'submodel_id' => 66,
+						'model_id' => 17,
+						'type' => 2
+					),
+				)
+			),
+			array(
+				'Model' => array(
+					'id' => 0,
+					'SubModelsModel' => array(
+						'id' => 4,
+						'submodel_id' => 66,
+						'model_id' => 0,
+						'type' => 2
+					)
+				)
+			)
+		);
+		$r = Set::extract('/Model/SubModelsModel[type=2]/..', $a);
+		$this->assertEqual($r, $expected);
+	}
 /**
  * test that extract() still works when arrays don't contain a 0 index.
  *

From 3040c6f586436df09231191b33c5ec41ac8cd683 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 27 Mar 2010 16:27:23 -0400
Subject: [PATCH 215/244] Moving tests around in set test.

---
 cake/tests/cases/libs/set.test.php | 158 ++++++++++++++---------------
 1 file changed, 78 insertions(+), 80 deletions(-)

diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index 8f983f4ec..1d4c29d48 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -795,10 +795,87 @@ function testExtract() {
 
 		$r = Set::extract('/Comment/User[name=/bob|tod/]/..', $habtm);
 		$this->assertEqual($r[0]['Comment']['User']['name'], 'bob');
-		// Currently failing, needs fix
 		$this->assertEqual($r[1]['Comment']['User']['name'], 'tod');
 		$this->assertEqual(count($r), 2);
 
+		$mixedKeys = array(
+			'User' => array(
+				0 => array(
+					'id' => 4,
+					'name' => 'Neo'
+				),
+				1 => array(
+					'id' => 5,
+					'name' => 'Morpheus'
+				),
+				'stringKey' => array()
+			)
+		);
+		$expected = array('Neo', 'Morpheus');
+		$r = Set::extract('/User/name', $mixedKeys);
+		$this->assertEqual($r, $expected);
+
+		$f = array(
+			array(
+				'file' => array(
+					'name' => 'zipfile.zip',
+					'type' => 'application/zip',
+					'tmp_name' => '/tmp/php178.tmp',
+					'error' => 0,
+					'size' => '564647'
+				)
+			),
+			array(
+				'file' => array(
+					'name' => 'zipfile2.zip',
+					'type' => 'application/x-zip-compressed',
+					'tmp_name' => '/tmp/php179.tmp',
+					'error' => 0,
+					'size' => '354784'
+				)
+			),
+			array(
+				'file' => array(
+					'name' => 'picture.jpg',
+					'type' => 'image/jpeg',
+					'tmp_name' => '/tmp/php180.tmp',
+					'error' => 0,
+					'size' => '21324'
+				)
+			)
+		);
+		$expected = array(array('name' => 'zipfile2.zip','type' => 'application/x-zip-compressed','tmp_name' => '/tmp/php179.tmp','error' => 0,'size' => '354784'));
+		$r = Set::extract('/file/.[type=application/x-zip-compressed]', $f);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(array('name' => 'zipfile.zip','type' => 'application/zip','tmp_name' => '/tmp/php178.tmp','error' => 0,'size' => '564647'));
+		$r = Set::extract('/file/.[type=application/zip]', $f);
+		$this->assertEqual($r, $expected);
+
+		$hasMany = array(
+			'Node' => array(
+				'id' => 1,
+				'name' => 'First',
+				'state' => 50
+			),
+			'ParentNode' => array(
+				0 => array(
+					'id' => 2,
+					'name' => 'Second',
+					'state' => 60,
+				)
+			)
+		);
+		$result = Set::extract('/ParentNode/name', $hasMany);
+		$expected = array('Second');
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test parent selectors with extract
+ *
+ * @return void
+ */
+	function testExtractParentSelector() {
 		$tree = array(
 			array(
 				'Category' => array(
@@ -855,24 +932,6 @@ function testExtract() {
 		$r = Set::extract('/Category[name=Category 2]/../children', $tree);
 		$this->assertEqual($r, $expected);
 
-		$mixedKeys = array(
-			'User' => array(
-				0 => array(
-					'id' => 4,
-					'name' => 'Neo'
-				),
-				1 => array(
-					'id' => 5,
-					'name' => 'Morpheus'
-				),
-				'stringKey' => array()
-			)
-		);
-
-		$expected = array('Neo', 'Morpheus');
-		$r = Set::extract('/User/name', $mixedKeys);
-		$this->assertEqual($r, $expected);
-
 		$single = array(
 			array(
 				'CallType' => array(
@@ -919,67 +978,6 @@ function testExtract() {
 		$r = Set::extract('/CallType[name=Internal Voice]/../x/hour', $multiple);
 		$this->assertEqual($r, $expected);
 
-		$f = array(
-			array(
-				'file' => array(
-					'name' => 'zipfile.zip',
-					'type' => 'application/zip',
-					'tmp_name' => '/tmp/php178.tmp',
-					'error' => 0,
-					'size' => '564647'
-				)
-			),
-			array(
-				'file' => array(
-					'name' => 'zipfile2.zip',
-					'type' => 'application/x-zip-compressed',
-					'tmp_name' => '/tmp/php179.tmp',
-					'error' => 0,
-					'size' => '354784'
-				)
-			),
-			array(
-				'file' => array(
-					'name' => 'picture.jpg',
-					'type' => 'image/jpeg',
-					'tmp_name' => '/tmp/php180.tmp',
-					'error' => 0,
-					'size' => '21324'
-				)
-			)
-		);
-		$expected = array(array('name' => 'zipfile2.zip','type' => 'application/x-zip-compressed','tmp_name' => '/tmp/php179.tmp','error' => 0,'size' => '354784'));
-		$r = Set::extract('/file/.[type=application/x-zip-compressed]', $f);
-		$this->assertEqual($r, $expected);
-
-		$expected = array(array('name' => 'zipfile.zip','type' => 'application/zip','tmp_name' => '/tmp/php178.tmp','error' => 0,'size' => '564647'));
-		$r = Set::extract('/file/.[type=application/zip]', $f);
-		$this->assertEqual($r, $expected);
-
-		$hasMany = array(
-			'Node' => array(
-				'id' => 1,
-				'name' => 'First',
-				'state' => 50
-			),
-			'ParentNode' => array(
-				0 => array(
-					'id' => 2,
-					'name' => 'Second',
-					'state' => 60,
-				)
-			)
-		);
-		$result = Set::extract('/ParentNode/name', $hasMany);
-		$expected = array('Second');
-		$this->assertEqual($result, $expected);
-	}
-/**
- * test parent selectors with extract
- *
- * @return void
- */
-	function testExtractParentSelector() {
 		$a = array(
 			'Model' => array(
 				'0' => array(

From f846005dfd5dd2ec36357515346193c476a32176 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Sun, 28 Mar 2010 09:14:09 +1100
Subject: [PATCH 216/244] Removed unnecessary override of Session::id() in
 SessionHelper.

---
 cake/libs/view/helpers/session.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php
index cec43c1fe..3ae83ca33 100644
--- a/cake/libs/view/helpers/session.php
+++ b/cake/libs/view/helpers/session.php
@@ -174,15 +174,6 @@ function valid() {
 	function write() {
 		trigger_error(__('You can not write to a Session from the view', true), E_USER_WARNING);
 	}
-/**
- * Session id
- *
- * @return string Session id
- * @access public
- */
-	function id() {
-		return parent::id();
-	}
 /**
  * Determine if Session has been started
  * and attempt to start it if not

From 5f3f66215aff2af90f06dee407a36adcf8f65f97 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Sun, 28 Mar 2010 18:19:24 +1100
Subject: [PATCH 217/244] Removing return statements from File::__construct.

---
 cake/libs/file.php | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/cake/libs/file.php b/cake/libs/file.php
index 334c0da14..a3d341631 100644
--- a/cake/libs/file.php
+++ b/cake/libs/file.php
@@ -88,7 +88,7 @@ class File extends Object {
  * @param string $path Path to file
  * @param boolean $create Create file if it does not exist (if true)
  * @param integer $mode Mode to apply to the folder holding the file
- * @access private
+ * @access public
  */
 	function __construct($path, $create = false, $mode = 0755) {
 		parent::__construct();
@@ -97,21 +97,12 @@ function __construct($path, $create = false, $mode = 0755) {
 			$this->name = basename($path);
 		}
 		$this->pwd();
-
-		if (!$this->exists()) {
-			if ($create === true) {
-				if ($this->safe($path) && $this->create() === false) {
-					return false;
-				}
-			} else {
-				return false;
-			}
-		}
+		!$this->exists() && $create === true && $this->safe($path) && $this->create();
 	}
 /**
  * Closes the current file if it is opened
  *
- * @access private
+ * @access public
  */
 	function __destruct() {
 		$this->close();

From 39a4566ddc4f5a366ab2526e4275cfc4aa3728e0 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sun, 28 Mar 2010 16:59:24 -0400
Subject: [PATCH 218/244] Fixing AclNode::node() so that node expressions that
 could match deeper elements are contained to their parent elements.  Test
 added.

---
 cake/libs/model/db_acl.php                  |  3 ++-
 cake/tests/cases/libs/model/db_acl.test.php | 16 +++++++++++++--
 cake/tests/fixtures/aco_fixture.php         | 22 +++++++++++----------
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/cake/libs/model/db_acl.php b/cake/libs/model/db_acl.php
index fddbc60c8..d2aa996ab 100644
--- a/cake/libs/model/db_acl.php
+++ b/cake/libs/model/db_acl.php
@@ -111,7 +111,8 @@ function node($ref = null) {
 					'conditions' => array(
 						$db->name("{$type}{$i}.lft") . ' > ' . $db->name("{$type}{$j}.lft"),
 						$db->name("{$type}{$i}.rght") . ' < ' . $db->name("{$type}{$j}.rght"),
-						$db->name("{$type}{$i}.alias") . ' = ' . $db->value($alias, 'string')
+						$db->name("{$type}{$i}.alias") . ' = ' . $db->value($alias, 'string'),
+						$db->name("{$type}{$j}.id") . ' = ' . $db->name("{$type}{$i}.parent_id")
 					)
 				);
 
diff --git a/cake/tests/cases/libs/model/db_acl.test.php b/cake/tests/cases/libs/model/db_acl.test.php
index 08cecedf8..bf8bd397b 100644
--- a/cake/tests/cases/libs/model/db_acl.test.php
+++ b/cake/tests/cases/libs/model/db_acl.test.php
@@ -260,7 +260,7 @@ function setUp() {
  * @return void
  */
 	function testNode() {
-		$Aco = new DbAcoTest();
+		$Aco =& new DbAcoTest();
 		$result = Set::extract($Aco->node('Controller1'), '{n}.DbAcoTest.id');
 		$expected = array(2, 1);
 		$this->assertEqual($result, $expected);
@@ -294,7 +294,19 @@ function testNode() {
 		$result = $Aco->node('');
 		$this->assertEqual($result, null);
 	}
-	/**
+
+/**
+ * test that node() doesn't dig deeper than it should.
+ *
+ * @return void
+ */
+	function testNodeWithDuplicatePathSegments() {
+		$Aco =& new DbAcoTest();
+		$nodes = $Aco->node('ROOT/Users');
+		$this->assertEqual($nodes[0]['DbAcoTest']['parent_id'], 1, 'Parent id does not point at ROOT. %s');
+	}
+
+/**
  * testNodeArrayFind method
  *
  * @access public
diff --git a/cake/tests/fixtures/aco_fixture.php b/cake/tests/fixtures/aco_fixture.php
index 3bedaed22..a003516ba 100644
--- a/cake/tests/fixtures/aco_fixture.php
+++ b/cake/tests/fixtures/aco_fixture.php
@@ -1,5 +1,4 @@
 <?php
-/* SVN FILE: $Id$ */
 /**
  * Short description for file.
  *
@@ -59,15 +58,18 @@ class AcoFixture extends CakeTestFixture {
  * @access public
  */
 	var $records = array(
-		array('parent_id' => null, 	'model' => null, 'foreign_key' => null, 'alias' => 'ROOT',			'lft' => 1,  'rght' => 18),
-		array('parent_id' => 1,		'model' => null, 'foreign_key' => null, 'alias' => 'Controller1',	'lft' => 2,  'rght' => 9),
-		array('parent_id' => 2,		'model' => null, 'foreign_key' => null, 'alias' => 'action1',		'lft' => 3,  'rght' => 6),
-		array('parent_id' => 3,		'model' => null, 'foreign_key' => null, 'alias' => 'record1',		'lft' => 4,  'rght' => 5),
-		array('parent_id' => 2,		'model' => null, 'foreign_key' => null, 'alias' => 'action2',		'lft' => 7,  'rght' => 8),
-		array('parent_id' => 1,		'model' => null, 'foreign_key' => null, 'alias' => 'Controller2',	'lft' => 10, 'rght' => 17),
-		array('parent_id' => 6,		'model' => null, 'foreign_key' => null, 'alias' => 'action1',		'lft' => 11, 'rght' => 14),
-		array('parent_id' => 7,		'model' => null, 'foreign_key' => null, 'alias' => 'record1',		'lft' => 12, 'rght' => 13),
-		array('parent_id' => 6,		'model' => null, 'foreign_key' => null, 'alias' => 'action2',		'lft' => 15, 'rght' => 16),
+		array('parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT', 'lft' => 1,  'rght' => 24),
+		array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'Controller1', 'lft' => 2,  'rght' => 9),
+		array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'action1', 'lft' => 3,  'rght' => 6),
+		array('parent_id' => 3, 'model' => null, 'foreign_key' => null, 'alias' => 'record1', 'lft' => 4,  'rght' => 5),
+		array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'action2', 'lft' => 7,  'rght' => 8),
+		array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'Controller2','lft' => 10, 'rght' => 17),
+		array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'action1', 'lft' => 11, 'rght' => 14),
+		array('parent_id' => 7, 'model' => null, 'foreign_key' => null, 'alias' => 'record1', 'lft' => 12, 'rght' => 13),
+		array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'action2', 'lft' => 15, 'rght' => 16),
+		array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'Users', 'lft' => 18, 'rght' => 23),
+		array('parent_id' => 9, 'model' => null, 'foreign_key' => null, 'alias' => 'Users', 'lft' => 19, 'rght' => 22),
+		array('parent_id' => 10, 'model' => null, 'foreign_key' => null, 'alias' => 'view', 'lft' => 20, 'rght' => 21),
 	);
 }
 

From 95c1ab3596d0e60964c0c6c99f0e033cb51dbd40 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sun, 28 Mar 2010 17:41:58 -0400
Subject: [PATCH 219/244] Fixing failing tests in SessionHelper caused by
 changes in CakeSession. Removing SessionHelper::id() as all it did was call
 the parent method.

---
 cake/libs/view/helpers/session.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php
index 3ae83ca33..69513870d 100644
--- a/cake/libs/view/helpers/session.php
+++ b/cake/libs/view/helpers/session.php
@@ -57,6 +57,8 @@ class SessionHelper extends CakeSession {
 	function __construct($base = null) {
 		if (Configure::read('Session.start') === true) {
 			parent::__construct($base, false);
+			$this->start();
+			$this->__active = true;
 		} else {
 			$this->__active = false;
 		}
@@ -180,11 +182,11 @@ function write() {
  *
  * @return boolean true if Session is already started, false if
  * Session could not be started
- * @access public
+ * @access private
  */
 	function __start() {
-		if (!parent::started()) {
-			parent::start();
+		if (!$this->started()) {
+			return $this->start();
 		}
 		return true;
 	}

From 289a4e9085ed5b2de0ad937b0ee48111c8a76e2b Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Mon, 29 Mar 2010 09:21:43 +1100
Subject: [PATCH 220/244] Moniro update to file construction.

---
 cake/libs/file.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/file.php b/cake/libs/file.php
index a3d341631..3306c5810 100644
--- a/cake/libs/file.php
+++ b/cake/libs/file.php
@@ -97,7 +97,7 @@ function __construct($path, $create = false, $mode = 0755) {
 			$this->name = basename($path);
 		}
 		$this->pwd();
-		!$this->exists() && $create === true && $this->safe($path) && $this->create();
+		!$this->exists() && $create && $this->safe($path) && $this->create();
 	}
 /**
  * Closes the current file if it is opened

From f56e24c64166d2c6e394265fb91d11de5ba52b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Lorenzo=20Rodr=C3=ADguez?= <jose.zap@gmail.com>
Date: Tue, 30 Mar 2010 12:50:15 -0430
Subject: [PATCH 221/244] Using Inflector::slug in Object::_persist() to avoid
 parse errors o malformed variable names, closes #365

---
 cake/libs/object.php                  | 4 ++--
 cake/tests/cases/libs/object.test.php | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cake/libs/object.php b/cake/libs/object.php
index e6790d817..3d6ea14a9 100644
--- a/cake/libs/object.php
+++ b/cake/libs/object.php
@@ -247,7 +247,7 @@ function _savePersistent($name, &$object) {
 		$file = 'persistent' . DS . strtolower($name) . '.php';
 		$objectArray = array(&$object);
 		$data = str_replace('\\', '\\\\', serialize($objectArray));
-		$data = '<?php $' . $name . ' = \'' . str_replace('\'', '\\\'', $data) . '\' ?>';
+		$data = '<?php $' . Inflector::slug($name) . ' = \'' . str_replace('\'', '\\\'', $data) . '\' ?>';
 		$duration = '+999 days';
 		if (Configure::read() >= 1) {
 			$duration = '+10 seconds';
@@ -287,7 +287,7 @@ function __openPersistent($name, $type = null) {
 				unset($vars);
 			break;
 			default:
-				$vars = unserialize(${$name});
+				$vars = unserialize(${Inflector::slug($name)});
 				$this->{$name} = $vars['0'];
 				unset($vars);
 			break;
diff --git a/cake/tests/cases/libs/object.test.php b/cake/tests/cases/libs/object.test.php
index 8993d8204..683878f33 100644
--- a/cake/tests/cases/libs/object.test.php
+++ b/cake/tests/cases/libs/object.test.php
@@ -409,6 +409,13 @@ function testPersist() {
 
 		@unlink(CACHE . 'persistent' . DS . 'objecttestmodel.php');
 
+		$data = new TestObject;
+		$this->object->testPersist('Tags.Tag', true, $data);
+		$this->assertTrue(file_exists(CACHE . 'persistent' . DS . 'tags.tag.php'));
+		$this->object->testPersist('Tags.Tag', true, $data);
+		$this->assertEqual($this->object->{'Tags.Tag'}, $data);
+		
+		@unlink(CACHE . 'persistent' . DS . 'tags.tag.php');
 		Configure::write('Cache.disable', $cacheDisable);
 	}
 /**

From 7e277e8239fc643f65c333a8076434a946ce5bbf Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Thu, 1 Apr 2010 07:54:48 +1100
Subject: [PATCH 222/244] Restored ability to link PHP files for CSS and JS
 from view helpers.

---
 cake/libs/view/helpers/html.php                        | 2 +-
 cake/libs/view/helpers/javascript.php                  | 2 +-
 cake/tests/cases/libs/view/helpers/html.test.php       | 4 ++++
 cake/tests/cases/libs/view/helpers/javascript.test.php | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index 3e8ff83fc..f5c3453a6 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -343,7 +343,7 @@ function css($path, $rel = null, $htmlAttributes = array(), $inline = true) {
 			}
 
 			if (strpos($path, '?') === false) {
-				if (substr($path, -4) !== '.css') {
+				if (!preg_match('/.*\.(css|php)$/i', $path)) {
 					$path .= '.css';
 				}
 			}
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index ec66579aa..ce744b909 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -248,7 +248,7 @@ function link($url, $inline = true) {
 				$url = JS_URL . $url;
 			}
 			if (strpos($url, '?') === false) {
-				if (substr($url, -3) !== '.js') {
+				if (!preg_match('/.*\.(js|php)$/i', $url)) {
 					$url .= '.js';
 				}
 			}
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
index d6d3be54e..701ca27e9 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -365,6 +365,10 @@ function testCssLink() {
 		$expected['link']['href'] = 'preg:/.*css\/my\.css\.library\.css/';
 		$this->assertTags($result, $expected);
 
+		$result = $this->Html->css('my.css.php');
+		$expected['link']['href'] = 'preg:/.*css\/my\.css\.php/';
+		$this->assertTags($result, $expected);
+
 		$result = $this->Html->css('screen.css?1234');
 		$expected['link']['href'] = 'preg:/.*css\/screen\.css\?1234/';
 		$this->assertTags($result, $expected);
diff --git a/cake/tests/cases/libs/view/helpers/javascript.test.php b/cake/tests/cases/libs/view/helpers/javascript.test.php
index 83c1b74d0..fcc1c1881 100644
--- a/cake/tests/cases/libs/view/helpers/javascript.test.php
+++ b/cake/tests/cases/libs/view/helpers/javascript.test.php
@@ -173,8 +173,8 @@ function testLink() {
 		$expected = '<script type="text/javascript" src="js/jquery-1.1.2.js"></script>';
 		$this->assertEqual($result, $expected);
 
-		$result = $this->Javascript->link('jquery-1.1.2');
-		$expected = '<script type="text/javascript" src="js/jquery-1.1.2.js"></script>';
+		$result = $this->Javascript->link('jquery-1.1.2.php');
+		$expected = '<script type="text/javascript" src="js/jquery-1.1.2.php"></script>';
 		$this->assertEqual($result, $expected);
 
 		$result = $this->Javascript->link('/plugin/js/jquery-1.1.2');

From 46c4cab95bd10855ed607d983bd39d5a3e5f9fe4 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Fri, 2 Apr 2010 15:43:20 -0400
Subject: [PATCH 223/244] Fixing Form::dateTime() for GET forms.  Tests added. 
 Fixes #522

---
 cake/libs/view/helpers/form.php                 |  7 ++++++-
 .../tests/cases/libs/view/helpers/form.test.php | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 0f81c320e..543cfaf81 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -1673,7 +1673,12 @@ function __name($options = array(), $field = null, $key = 'name') {
 			if (is_array($options) && isset($options[$key])) {
 				return $options;
 			}
-			$name = $this->field();
+
+			$view = ClassRegistry::getObject('view');
+			$name = $view->field;
+			if (!empty($view->fieldSuffix)) {
+				$name .= '[' . $view->fieldSuffix . ']';
+			}
 
 			if (is_array($options)) {
 				$options[$key] = $name;
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index db6811142..1ab4f1997 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -4702,6 +4702,23 @@ function testGetFormCreate() {
 			'name' => 'user_form', 'type' => 'text', 'value' => '', 'id' => 'ContactUserForm'
 		)));
 	}
+/**
+ * test that datetime() works with GET style forms.
+ *
+ * @return void
+ */
+	function testDateTimeWithGetForms() {
+		extract($this->dateRegex);
+		$this->Form->create('Contact', array('type' => 'get'));
+		$result = $this->Form->datetime('created');
+
+		$this->assertPattern('/name="created\[year\]"/', $result, 'year name attribute is wrong.');
+		$this->assertPattern('/name="created\[month\]"/', $result, 'month name attribute is wrong.');
+		$this->assertPattern('/name="created\[day\]"/', $result, 'day name attribute is wrong.');
+		$this->assertPattern('/name="created\[hour\]"/', $result, 'hour name attribute is wrong.');
+		$this->assertPattern('/name="created\[min\]"/', $result, 'min name attribute is wrong.');
+		$this->assertPattern('/name="created\[meridian\]"/', $result, 'meridian name attribute is wrong.');
+	}
 /**
  * testEditFormWithData method
  *

From 629740d59631857996488a5aa420fbe629769450 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Mon, 5 Apr 2010 21:43:16 -0400
Subject: [PATCH 224/244] Fixing discrepancy between how belongsTo and hasOne
 assocations are treated in relation to their fields being added into the
 queryData.  hasOne and belongsTo associations now behave the same.  Fixes
 #379

---
 cake/libs/model/behaviors/containable.php     | 12 ++--
 .../libs/model/behaviors/containable.test.php | 65 +++++++++++++++++--
 2 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php
index 8ace8760f..083bdc6cb 100644
--- a/cake/libs/model/behaviors/containable.php
+++ b/cake/libs/model/behaviors/containable.php
@@ -182,11 +182,13 @@ function beforeFind(&$Model, $query) {
 		}
 
 		$query['fields'] = (array)$query['fields'];
-		if (!empty($Model->belongsTo)) {
-			foreach ($Model->belongsTo as $assoc => $data) {
-				if (!empty($data['fields'])) {
-					foreach ((array) $data['fields'] as $field) {
-						$query['fields'][] = (strpos($field, '.') === false ? $assoc . '.' : '') . $field;
+		foreach (array('hasOne', 'belongsTo') as $type) {
+			if (!empty($Model->{$type})) {
+				foreach ($Model->{$type} as $assoc => $data) {
+					if (!empty($data['fields'])) {
+						foreach ((array) $data['fields'] as $field) {
+							$query['fields'][] = (strpos($field, '.') === false ? $assoc . '.' : '') . $field;
+						}
 					}
 				}
 			}
diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index a2a6fdc71..239578ef1 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -2872,7 +2872,10 @@ function testFindEmbeddedThirdLevelNonReset() {
  * @return void
  */
 	function testEmbeddedFindFields() {
-		$result = $this->Article->find('all', array('contain' => array('User(user)'), 'fields' => array('title')));
+		$result = $this->Article->find('all', array(
+			'contain' => array('User(user)'),
+			'fields' => array('title')
+		));
 		$expected = array(
 			array('Article' => array('title' => 'First Article'), 'User' => array('user' => 'mariano', 'id' => 1)),
 			array('Article' => array('title' => 'Second Article'), 'User' => array('user' => 'larry', 'id' => 3)),
@@ -2880,7 +2883,10 @@ function testEmbeddedFindFields() {
 		);
 		$this->assertEqual($result, $expected);
 
-		$result = $this->Article->find('all', array('contain' => array('User(id, user)'), 'fields' => array('title')));
+		$result = $this->Article->find('all', array(
+			'contain' => array('User(id, user)'),
+			'fields' => array('title')
+		));
 		$expected = array(
 			array('Article' => array('title' => 'First Article'), 'User' => array('user' => 'mariano', 'id' => 1)),
 			array('Article' => array('title' => 'Second Article'), 'User' => array('user' => 'larry', 'id' => 3)),
@@ -2888,7 +2894,12 @@ function testEmbeddedFindFields() {
 		);
 		$this->assertEqual($result, $expected);
 
-		$result = $this->Article->find('all', array('contain' => array('Comment(comment, published)' => 'Attachment(attachment)', 'User(user)'), 'fields' => array('title')));
+		$result = $this->Article->find('all', array(
+			'contain' => array(
+				'Comment(comment, published)' => 'Attachment(attachment)', 'User(user)'
+			),
+			'fields' => array('title')
+		));
 		if (!empty($result)) {
 			foreach($result as $i=>$article) {
 				foreach($article['Comment'] as $j=>$comment) {
@@ -2925,6 +2936,38 @@ function testEmbeddedFindFields() {
 		);
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * test that hasOne and belongsTo fields act the same in a contain array.
+ *
+ * @return void
+ */
+	function testHasOneFieldsInContain() {
+		$this->Article->unbindModel(array(
+			'hasMany' => array('Comment')
+		), true);
+		unset($this->Article->Comment);
+		$this->Article->bindModel(array(
+			'hasOne' => array('Comment')
+		));
+
+		$result = $this->Article->find('all', array(
+			'fields' => array('title', 'body'),
+			'contain' => array(
+				'Comment' => array(
+					'fields' => array('comment')
+				),
+				'User' => array(
+					'fields' => array('user')
+				)
+			)
+		));
+		$this->assertTrue(isset($result[0]['Article']['title']), 'title missing %s');
+		$this->assertTrue(isset($result[0]['Article']['body']), 'body missing %s');
+		$this->assertTrue(isset($result[0]['Comment']['comment']), 'comment missing %s');
+		$this->assertTrue(isset($result[0]['User']['user']), 'body missing %s');
+		$this->assertFalse(isset($result[0]['Comment']['published']), 'published found %s');
+		$this->assertFalse(isset($result[0]['User']['password']), 'password found %s');
+	}
 /**
  * testFindConditionalBinding method
  *
@@ -2932,7 +2975,13 @@ function testEmbeddedFindFields() {
  * @return void
  */
 	function testFindConditionalBinding() {
-		$this->Article->contain(array('User(user)', 'Tag' => array('fields' => array('tag', 'created'), 'conditions' => array('created >=' => '2007-03-18 12:24'))));
+		$this->Article->contain(array(
+			'User(user)',
+			'Tag' => array(
+				'fields' => array('tag', 'created'),
+				'conditions' => array('created >=' => '2007-03-18 12:24')
+			)
+		));
 		$result = $this->Article->find('all', array('fields' => array('title')));
 		$expected = array(
 			array(
@@ -3009,7 +3058,13 @@ function testFindConditionalBinding() {
 		);
 		$this->assertEqual($result, $expected);
 
-		$this->Article->contain(array('User(id,user)', 'Tag' => array('fields' => array('tag', 'created'), 'conditions' => array('created >=' => '2007-03-18 12:24'))));
+		$this->Article->contain(array(
+			'User(id,user)',
+			'Tag' => array(
+				'fields' => array('tag', 'created'),
+				'conditions' => array('created >=' => '2007-03-18 12:24')
+			)
+		));
 		$result = $this->Article->find('all', array('fields' => array('title')));
 		$expected = array(
 			array(

From 3af22eec91d4e14d2c31f3bdee36b54e237b8c99 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 10 Apr 2010 16:57:50 -0400
Subject: [PATCH 225/244] Adding tests from 'tfs' fixes inconsistencies in
 extracting elements with one path selector.  Fixes #555

---
 cake/libs/set.php                  | 14 ++++----
 cake/tests/cases/libs/set.test.php | 58 +++++++++++++++++++++++++++++-
 2 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/cake/libs/set.php b/cake/libs/set.php
index 64f55b0e6..2849b2897 100644
--- a/cake/libs/set.php
+++ b/cake/libs/set.php
@@ -448,18 +448,18 @@ function extract($path, $data = null, $options = array()) {
 						$ctext = array($context['key']);
 						if (!is_numeric($key)) {
 							$ctext[] = $token;
-							$token = array_shift($tokens);
-							if (isset($items[$token])) {
-								$ctext[] = $token;
-								$item = $items[$token];
+							$tok = array_shift($tokens);
+							if (isset($items[$tok])) {
+								$ctext[] = $tok;
+								$item = $items[$tok];
 								$matches[] = array(
 									'trace' => array_merge($context['trace'], $ctext),
-									'key' => $token,
+									'key' => $tok,
 									'item' => $item,
 								);
 								break;
-							} else {
-								array_unshift($tokens, $token);
+							} elseif ($tok !== null) {
+								array_unshift($tokens, $tok);
 							}
 						} else {
 							$key = $token;
diff --git a/cake/tests/cases/libs/set.test.php b/cake/tests/cases/libs/set.test.php
index 1d4c29d48..ece4fd443 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/cake/tests/cases/libs/set.test.php
@@ -919,7 +919,6 @@ function testExtractParentSelector() {
 				)
 			)
 		);
-
 		$expected = array(array('Category' => $tree[1]['Category']));
 		$r = Set::extract('/Category[name=Category 2]', $tree);
 		$this->assertEqual($r, $expected);
@@ -1076,6 +1075,14 @@ function testExtractWithNonZeroArrays() {
 		$r = Set::extract('/User/id', $nonZero);
 		$this->assertEqual($r, $expected);
 		
+		$expected = array(
+			array('User' => array('id' => 1, 'name' => 'John')),
+			array('User' => array('id' => 2, 'name' => 'Bob')),
+			array('User' => array('id' => 3, 'name' => 'Tony')),
+		);
+		$result = Set::extract('/User', $nonZero);
+		$this->assertEqual($result, $expected);
+
 		$nonSequential = array(
 			'User' => array(
 				0  => array('id' => 1),
@@ -1137,6 +1144,55 @@ function testExtractWithArrays() {
 		$this->assertEqual(Set::extract('/Level1/Level2', $data), array(array('Level2' => array('test1', 'test2'))));
 		$this->assertEqual(Set::extract('/Level1/Level2bis', $data), array(array('Level2bis' => array('test3', 'test4'))));
 	}
+
+/**
+ * test extract() with elements that have non-array children.
+ *
+ * @return void
+ */
+	function testExtractWithNonArrayElements() {
+		$data = array(
+			'node' => array(
+				array('foo'),
+				'bar'
+			)
+		);
+		$result = Set::extract('/node', $data);
+		$expected = array(
+			array('node' => array('foo')),
+			'bar'
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'node' => array(
+				'foo' => array('bar'),
+				'bar' => array('foo')
+			)
+		);
+		$result = Set::extract('/node', $data);
+		$expected = array(
+			array('foo' => array('bar')),
+			array('bar' => array('foo')),
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'node' => array(
+				'foo' => array(
+					'bar'
+				),
+				'bar' => 'foo'
+			)
+		);
+		$result = Set::extract('/node', $data);
+		$expected = array(
+			array('foo' => array('bar')),
+			'foo'
+		);
+		$this->assertEqual($result, $expected);
+	}
+
 /**
  * testMatches method
  *

From 8103581f26a60bcd8067d4d8281aaefd458f05a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Lorenzo=20Rodr=C3=ADguez?= <jose.zap@gmail.com>
Date: Tue, 13 Apr 2010 01:08:31 -0430
Subject: [PATCH 226/244] Fixing schema generation for postgres. Now character
 varying without lenght is translated to "text", to avoid sql errors. Closes
 #564

---
 cake/libs/model/datasources/dbo/dbo_postgres.php           | 7 ++++++-
 .../cases/libs/model/datasources/dbo/dbo_postgres.test.php | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index ede59a231..303176c32 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -217,7 +217,12 @@ function &describe(&$model) {
 					if (!empty($c['char_length'])) {
 						$length = intval($c['char_length']);
 					} elseif (!empty($c['oct_length'])) {
-						$length = intval($c['oct_length']);
+						if ($c['type'] == 'character varying') {
+							$length = null;
+							$c['type'] = 'text';
+						} else {
+							$length = intval($c['oct_length']);
+						}
 					} else {
 						$length = $this->length($c['type']);
 					}
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
index bfd375d77..05b9e78ef 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
@@ -472,6 +472,7 @@ function testCakeSchema() {
 		$db1->query('CREATE TABLE ' .  $db1->fullTableName('datatypes') . ' (
 			id serial NOT NULL,
 			"varchar" character varying(40) NOT NULL,
+			"full_length" character varying NOT NULL,
 			"timestamp" timestamp without time zone,
 			date date,
 			CONSTRAINT test_suite_data_types_pkey PRIMARY KEY (id)
@@ -484,7 +485,9 @@ function testCakeSchema() {
 		));
 		$schema->tables = array('datatypes' => $result['tables']['datatypes']);
 		$result = $db1->createSchema($schema, 'datatypes');
+
 		$this->assertNoPattern('/timestamp DEFAULT/', $result);
+		$this->assertPattern('/\"full_length\"\s*text\s.*,/', $result);
 		$this->assertPattern('/timestamp\s*,/', $result);
 
 		$db1->query('DROP TABLE ' . $db1->fullTableName('datatypes'));

From 864ea3d0c4abea49944eacef03e7d7868e790eda Mon Sep 17 00:00:00 2001
From: Mariano Iglesias <mariano@cricava.com>
Date: Tue, 13 Apr 2010 15:33:24 -0300
Subject: [PATCH 227/244] Fixing issue where TextHelper::autoLinkUrls was
 failing on some expressions

---
 cake/libs/view/helpers/text.php               | 10 +----
 .../cases/libs/view/helpers/text.test.php     | 40 ++++++++++++++++---
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php
index 3ab93a4ef..455c667ee 100644
--- a/cake/libs/view/helpers/text.php
+++ b/cake/libs/view/helpers/text.php
@@ -103,14 +103,8 @@ function stripLinks($text) {
  * @access public
  */
 	function autoLinkUrls($text, $htmlOptions = array()) {
-		$options = 'array(';
-		foreach ($htmlOptions as $option => $value) {
-				$value = var_export($value, true);
-				$options .= "'$option' => $value, ";
-		}
-		$options .= ')';
-
-		$text = preg_replace_callback('#(?<!href="|">)((?:http|https|ftp|nntp)://[^ <]+)#i', create_function('$matches',
+		$options = var_export($htmlOptions, true);
+		$text = preg_replace_callback('#(?<!href="|">)((?:https?|ftp|nntp)://[^\s<>()]+)#i', create_function('$matches',
 			'$Html = new HtmlHelper(); $Html->tags = $Html->loadConfig(); return $Html->link($matches[0], $matches[0],' . $options . ');'), $text);
 
 		return preg_replace_callback('#(?<!href="|">)(?<!http://|https://|ftp://|nntp://)(www\.[^\n\%\ <]+[^<\n\%\,\.\ <])(?<!\))#i',
diff --git a/cake/tests/cases/libs/view/helpers/text.test.php b/cake/tests/cases/libs/view/helpers/text.test.php
index 34b497421..403b725b3 100644
--- a/cake/tests/cases/libs/view/helpers/text.test.php
+++ b/cake/tests/cases/libs/view/helpers/text.test.php
@@ -101,7 +101,7 @@ function testTruncate() {
 		$this->assertIdentical($this->Text->{$m}($text8, 15), 'Vive la R'.chr(195).chr(169).'pu...');
 		$this->assertIdentical($this->Text->{$m}($text1, 25, 'Read more'), 'The quick brown Read more');
 		$this->assertIdentical($this->Text->{$m}($text1, 25, '<a href="http://www.google.com/">Read more</a>', true, true), 'The quick brown <a href="http://www.google.com/">Read more</a>');
-		
+
 		if ($this->method == 'truncate') {
 			$this->method = 'trim';
 			$this->testTruncate();
@@ -199,6 +199,36 @@ function testAutoLink() {
 		$result = $this->Text->autoLink($text);
 		$expected = 'Text with a partial <a href="http://www.cakephp.org">www.cakephp.org</a> URL and <a href="mailto:test@cakephp\.org">test@cakephp\.org</a> email address';
 		$this->assertPattern('#^' . $expected . '$#', $result);
+
+		$text = 'This is a test text with URL http://www.cakephp.org';
+		$expected = 'This is a test text with URL <a href="http://www.cakephp.org">http://www.cakephp.org</a>';
+		$result = $this->Text->autoLink($text);
+		$this->assertEqual($result, $expected);
+
+		$text = 'This is a test text with URL http://www.cakephp.org and some more text';
+		$expected = 'This is a test text with URL <a href="http://www.cakephp.org">http://www.cakephp.org</a> and some more text';
+		$result = $this->Text->autoLink($text);
+		$this->assertEqual($result, $expected);
+
+		$text = "This is a test text with URL http://www.cakephp.org\tand some more text";
+		$expected = "This is a test text with URL <a href=\"http://www.cakephp.org\">http://www.cakephp.org</a>\tand some more text";
+		$result = $this->Text->autoLink($text);
+		$this->assertEqual($result, $expected);
+
+		$text = 'This is a test text with URL http://www.cakephp.org(and some more text)';
+		$expected = 'This is a test text with URL <a href="http://www.cakephp.org">http://www.cakephp.org</a>(and some more text)';
+		$result = $this->Text->autoLink($text);
+		$this->assertEqual($result, $expected);
+
+		$text = 'This is a test text with URL http://www.cakephp.org';
+		$expected = 'This is a test text with URL <a href="http://www.cakephp.org" class="link">http://www.cakephp.org</a>';
+		$result = $this->Text->autoLink($text, array('class'=>'link'));
+		$this->assertEqual($result, $expected);
+
+		$text = 'This is a test text with URL http://www.cakephp.org';
+		$expected = 'This is a test text with URL <a href="http://www.cakephp.org" class="link" id="MyLink">http://www.cakephp.org</a>';
+		$result = $this->Text->autoLink($text, array('class'=>'link', 'id'=>'MyLink'));
+		$this->assertEqual($result, $expected);
 	}
 /**
  * testAutoLinkUrls method
@@ -288,19 +318,19 @@ function testExcerpt() {
 		$expected = '...with test text...';
 		$result = $this->Text->excerpt($text, 'test', 9, '...');
 		$this->assertEqual($expected, $result);
-		
+
 		$expected = 'This is a...';
 		$result = $this->Text->excerpt($text, 'not_found', 9, '...');
 		$this->assertEqual($expected, $result);
-		
+
 		$expected = 'This is a phras...';
 		$result = $this->Text->excerpt($text, null, 9, '...');
 		$this->assertEqual($expected, $result);
-		
+
 		$expected = $text;
 		$result = $this->Text->excerpt($text, null, 200, '...');
 		$this->assertEqual($expected, $result);
-		
+
 		$expected = '...phrase...';
 		$result = $this->Text->excerpt($text, 'phrase', 2, '...');
 		$this->assertEqual($expected, $result);

From 1fee86f650cbc83e1490368c60ac32f14128ad96 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 17 Apr 2010 18:47:45 -0400
Subject: [PATCH 228/244] Adding tests for creating cache configs of different
 types in sequence.  Demonstrates error explained in #596.

---
 cake/tests/cases/libs/cache/memcache.test.php | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/cake/tests/cases/libs/cache/memcache.test.php
index 0a62804fb..6090b7d3b 100644
--- a/cake/tests/cases/libs/cache/memcache.test.php
+++ b/cake/tests/cases/libs/cache/memcache.test.php
@@ -61,7 +61,11 @@ function skip() {
 	function setUp() {
 		$this->_cacheDisable = Configure::read('Cache.disable');
 		Configure::write('Cache.disable', false);
-		Cache::config('memcache', array('engine' => 'Memcache', 'prefix' => 'cake_'));
+		Cache::config('memcache', array(
+			'engine' => 'Memcache',
+			'prefix' => 'cake_',
+			'duration' => 3600
+		));
 	}
 /**
  * tearDown method
@@ -222,5 +226,41 @@ function testDeleteCache() {
 		$result = Cache::delete('delete_test');
 		$this->assertTrue($result);
 	}
+
+/**
+ * test that configurations don't conflict, when a file engine is declared after a memcache one.
+ *
+ * @return void
+ */
+	function testConfigurationConflict() {
+		Cache::config('long_memcache', array(
+		  'engine' => 'Memcache',
+		  'duration'=> '+2 seconds',
+		  'servers' => array('127.0.0.1:11211'),
+		));
+		Cache::config('short_memcache', array(
+		  'engine' => 'Memcache',
+		  'duration'=> '+1 seconds',
+		  'servers' => array('127.0.0.1:11211'),
+		));
+		Cache::config('some_file', array('engine' => 'File'));
+
+		$this->assertTrue(Cache::write('duration_test', 'yay', 'long_memcache'));
+		$this->assertTrue(Cache::write('short_duration_test', 'boo', 'short_memcache'));
+
+		$this->assertEqual(Cache::read('duration_test', 'long_memcache'), 'yay', 'Value was not read %s');
+		$this->assertEqual(Cache::read('short_duration_test', 'short_memcache'), 'boo', 'Value was not read %s');
+
+		sleep(1);
+		$this->assertEqual(Cache::read('duration_test', 'long_memcache'), 'yay', 'Value was not read %s');
+
+		sleep(2);
+		$this->assertFalse(Cache::read('short_duration_test', 'short_memcache'), 'Cache was not invalidated %s');
+		$this->assertFalse(Cache::read('duration_test', 'long_memcache'), 'Value did not expire %s');
+
+		Cache::delete('duration_test', 'long_memcache');
+		Cache::delete('short_duration_test', 'short_memcache');
+	}
+
 }
 ?>
\ No newline at end of file

From 5ed5c54a61386f286fabd711f37dfe6616e8c57a Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 17 Apr 2010 18:48:23 -0400
Subject: [PATCH 229/244] Adding fix for tests in previous commit.  Fixes #596

---
 cake/libs/cache.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index e707137ae..d87c944d2 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -175,7 +175,10 @@ function set($settings = array(), $value = null) {
 			return false;
 		}
 
-		$engine = $_this->__config[$_this->__name]['engine'];
+		$engine = $_this->__config[$_this->__name]['engine'];	
+		if (isset($settings['engine'])) {
+			$engine = $settings['engine'];
+		}
 
 		if (!empty($settings)) {
 			$_this->__reset = true;
@@ -289,6 +292,7 @@ function read($key, $config = null) {
 		if (!$key = $_this->_Engine[$engine]->key($key)) {
 			return false;
 		}
+	
 		$success = $_this->_Engine[$engine]->read($settings['prefix'] . $key);
 
 		if ($config !== null && $config !== $_this->__name) {

From a5f019799ae1adbfdae7f511e6404efc132750aa Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Mon, 19 Apr 2010 22:38:18 -0400
Subject: [PATCH 230/244] Fixing autoFields causing invalid SQL when cross
 database joins are being done.  Tests added.  Fixes #476

---
 cake/libs/model/behaviors/containable.php     | 15 +++++++--
 .../libs/model/behaviors/containable.test.php | 33 +++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php
index 083bdc6cb..3d5efcce2 100644
--- a/cake/libs/model/behaviors/containable.php
+++ b/cake/libs/model/behaviors/containable.php
@@ -185,7 +185,7 @@ function beforeFind(&$Model, $query) {
 		foreach (array('hasOne', 'belongsTo') as $type) {
 			if (!empty($Model->{$type})) {
 				foreach ($Model->{$type} as $assoc => $data) {
-					if (!empty($data['fields'])) {
+					if ($Model->useDbConfig == $Model->{$assoc}->useDbConfig && !empty($data['fields'])) {
 						foreach ((array) $data['fields'] as $field) {
 							$query['fields'][] = (strpos($field, '.') === false ? $assoc . '.' : '') . $field;
 						}
@@ -193,15 +193,24 @@ function beforeFind(&$Model, $query) {
 				}
 			}
 		}
+
 		if (!empty($mandatory[$Model->alias])) {
 			foreach ($mandatory[$Model->alias] as $field) {
 				if ($field == '--primaryKey--') {
 					$field = $Model->primaryKey;
 				} else if (preg_match('/^.+\.\-\-[^-]+\-\-$/', $field)) {
 					list($modelName, $field) = explode('.', $field);
-					$field = $modelName . '.' . (($field === '--primaryKey--') ? $Model->$modelName->primaryKey : $field);
+					if ($Model->useDbConfig == $Model->{$modelName}->useDbConfig) {
+						$field = $modelName . '.' . (
+							($field === '--primaryKey--') ? $Model->$modelName->primaryKey : $field
+						);
+					} else {
+						$field = null;
+					}
+				}
+				if ($field !== null) {
+					$query['fields'][] = $field;
 				}
-				$query['fields'][] = $field;
 			}
 		}
 		$query['fields'] = array_unique($query['fields']);
diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index 239578ef1..69f4b63e3 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -3573,6 +3573,39 @@ function testResetMultipleHabtmAssociations() {
 		$this->Article->find('all', array('contain' => array('ShortTag' => array('fields' => array('ShortTag.tag', 'ShortTag.created')))));
 		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
 	}
+/**
+ * test that autoFields doesn't splice in fields from other databases.
+ *
+ * @return void
+ */
+	function testAutoFieldsWithMultipleDatabases() {
+		$config = new DATABASE_CONFIG();
+
+		$skip = $this->skipIf(
+			!isset($config->test) || !isset($config->test2),
+			 '%s Primary and secondary test databases not configured, skipping cross-database '
+			.'join tests.'
+			.' To run these tests, you must define $test and $test2 in your database configuration.'
+		);
+		if ($skip) {
+			return;
+		}
+
+		$db =& ConnectionManager::getDataSource('test2');
+		$this->_fixtures[$this->_fixtureClassMap['User']]->create($db);
+		$this->_fixtures[$this->_fixtureClassMap['User']]->insert($db);
+
+		$this->Article->User->setDataSource('test2');
+
+		$result = $this->Article->find('all', array(
+			'fields' => array('Article.title'),
+			'contain' => array('User')
+		));
+		$this->assertTrue(isset($result[0]['Article']));
+		$this->assertTrue(isset($result[0]['User']));
+
+		$this->_fixtures[$this->_fixtureClassMap['User']]->drop($db);
+	}
 /**
  * containments method
  *

From 6600c92cd3c061c4d37792727fd0372a737c1b47 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Mon, 19 Apr 2010 23:15:59 -0400
Subject: [PATCH 231/244] Adding test to show correct functioning of
 containable + field() + recursive = -1.  Closes #409

---
 .../cases/libs/model/behaviors/containable.test.php   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index 69f4b63e3..855434e56 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -3606,6 +3606,17 @@ function testAutoFieldsWithMultipleDatabases() {
 
 		$this->_fixtures[$this->_fixtureClassMap['User']]->drop($db);
 	}
+/**
+ * test that autoFields doesn't splice in columns that aren't part of the join.
+ *
+ * @return void
+ */
+	function testAutoFieldsWithRecursiveNegativeOne() {
+		$this->Article->recursive = -1;
+		$result = $this->Article->field('title', array('Article.title' => 'First Article'));
+		$this->assertNoErrors();
+		$this->assertEqual($result, 'First Article', 'Field is wrong');
+	}
 /**
  * containments method
  *

From f70f7de443179c52a18619c4aaf3834999023586 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Thu, 22 Apr 2010 22:50:04 -0400
Subject: [PATCH 232/244] Making tests more accurate to normal use, removing
 extra params and adding some tests for sortKey.  Refs #614

---
 .../cases/libs/view/helpers/paginator.test.php     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 9f8ca3b0b..129beb4b3 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -47,12 +47,12 @@ function setUp() {
 				'nextPage' => true,
 				'pageCount' => 7,
 				'defaults' => array(
-					'order' => 'Article.date ASC',
+					'order' => array('Article.date' => 'asc'),
 					'limit' => 9,
 					'conditions' => array()
 				),
 				'options' => array(
-					'order' => 'Article.date ASC',
+					'order' => array('Article.date' => 'asc'),
 					'limit' => 9,
 					'page' => 1,
 					'conditions' => array()
@@ -131,7 +131,7 @@ function testSortLinks() {
 		Router::reload();
 		Router::parse('/');
 		Router::setRequestInfo(array(
-			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'form' => array(), 'url' => array('url' => 'accounts/', 'mod_rewrite' => 'true'), 'bare' => 0),
+			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'form' => array(), 'url' => array('url' => 'accounts/'), 'bare' => 0),
 			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/', 'passedArgs' => array())
 		));
 		$this->Paginator->options(array('url' => array('param')));
@@ -240,9 +240,15 @@ function testSortLinksUsingDotNotation() {
  */
 	function testSortKey() {
 		$result = $this->Paginator->sortKey(null, array(
-				'order' => array('Article.title' => 'desc'
+			'order' => array('Article.title' => 'desc'
 		)));
 		$this->assertEqual('Article.title', $result);
+
+		$result = $this->Paginator->sortKey('Article', array('sort' => 'Article.title'));
+		$this->assertEqual($result, 'Article.title');
+
+		$result = $this->Paginator->sortKey('Article', array('sort' => 'Article'));
+		$this->assertEqual($result, 'Article');
 	}
 /**
  * testSortDir method

From a62e7bdda9fc98c4e9e8b64232c5bd8dd8af9722 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Thu, 22 Apr 2010 23:17:11 -0400
Subject: [PATCH 233/244] Fixing security vulnerabilities in the test suite
 runner.

---
 cake/tests/lib/test_manager.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php
index 5f447612e..5622b959d 100644
--- a/cake/tests/lib/test_manager.php
+++ b/cake/tests/lib/test_manager.php
@@ -50,7 +50,7 @@ function TestManager() {
 			$this->appTest = true;
 		}
 		if (isset($_GET['plugin'])) {
-			$this->pluginTest = $_GET['plugin'];
+			$this->pluginTest = htmlentities($_GET['plugin']);
 		}
 	}
 /**
@@ -110,8 +110,11 @@ function runTestCase($testCaseFile, &$reporter, $testing = false) {
 
 		$testCaseFileWithPath = $manager->_getTestsPath() . DS . $testCaseFile;
 
-		if (!file_exists($testCaseFileWithPath)) {
-			trigger_error("Test case {$testCaseFile} cannot be found", E_USER_ERROR);
+		if (!file_exists($testCaseFileWithPath) || strpos($testCaseFileWithPath, '..')) {
+			trigger_error(
+				sprintf("Test case %s cannot be found", htmlentities($testCaseFile)),
+				E_USER_ERROR
+			);
 			return false;
 		}
 
@@ -135,8 +138,11 @@ function runGroupTest($groupTestName, &$reporter) {
 		$manager =& new TestManager();
 		$filePath = $manager->_getTestsPath('groups') . DS . strtolower($groupTestName) . $manager->_groupExtension;
 
-		if (!file_exists($filePath)) {
-			trigger_error("Group test {$groupTestName} cannot be found at {$filePath}", E_USER_ERROR);
+		if (!file_exists($filePath) || strpos($testCaseFileWithPath, '..')) {
+			trigger_error(
+				sprintf("Group test %s cannot be found at %s", htmlentities($groupTestName), htmlentities($filePath)),
+				E_USER_ERROR
+			);
 		}
 
 		require_once $filePath;

From 359a770b8a640ac1845d953ed5b143c16eaea392 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Fri, 23 Apr 2010 13:47:58 +1000
Subject: [PATCH 234/244] Fixing group path checking in test manager.

---
 cake/tests/lib/test_manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php
index 5622b959d..b65653680 100644
--- a/cake/tests/lib/test_manager.php
+++ b/cake/tests/lib/test_manager.php
@@ -138,7 +138,7 @@ function runGroupTest($groupTestName, &$reporter) {
 		$manager =& new TestManager();
 		$filePath = $manager->_getTestsPath('groups') . DS . strtolower($groupTestName) . $manager->_groupExtension;
 
-		if (!file_exists($filePath) || strpos($testCaseFileWithPath, '..')) {
+		if (!file_exists($filePath) || strpos($filePath, '..')) {
 			trigger_error(
 				sprintf("Group test %s cannot be found at %s", htmlentities($groupTestName), htmlentities($filePath)),
 				E_USER_ERROR

From 1ea163fbf16f82889d3773ecfff693e7c5703465 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Fri, 23 Apr 2010 14:01:49 +1000
Subject: [PATCH 235/244] Fix viewpath for RequestHandler testing.

---
 .../libs/controller/components/request_handler.test.php    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php
index 97f1e0751..7dc8087cc 100644
--- a/cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/cake/tests/cases/libs/controller/components/request_handler.test.php
@@ -561,9 +561,8 @@ function testAjaxRedirectAsRequestAction() {
  */
 	function testBeforeRedirectCallbackWithArrayUrl() {
 		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
-		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
-		), true);
+		$_paths = Configure::read('viewPaths');
+		Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS));
 		Router::setRequestInfo(array(
 			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'named' => array(), 'form' => array(), 'url' => array('url' => 'accounts/'), 'bare' => 0),
 			array('base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/')
@@ -578,7 +577,7 @@ function testBeforeRedirectCallbackWithArrayUrl() {
 		);
 		$result = ob_get_clean();
 		$this->assertEqual($result, 'one: first two: second');
-		App::build();
+		Configure::write('viewPaths', $_paths);
 	}
 }
 ?>
\ No newline at end of file

From 844362225698b1dba1ffb7060c0533dcaef7396b Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Fri, 23 Apr 2010 14:15:19 +1000
Subject: [PATCH 236/244] Updating version numbers to 1.2.7

---
 cake/config/config.php        | 2 +-
 cake/libs/view/pages/home.ctp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/config/config.php b/cake/config/config.php
index 232cda5ea..3c42eb87d 100644
--- a/cake/config/config.php
+++ b/cake/config/config.php
@@ -21,5 +21,5 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-return $config['Cake.version'] = '1.2.6';
+return $config['Cake.version'] = '1.2.7';
 ?>
\ No newline at end of file
diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp
index 33c31745e..b986e992e 100644
--- a/cake/libs/view/pages/home.ctp
+++ b/cake/libs/view/pages/home.ctp
@@ -25,7 +25,7 @@ if (Configure::read() == 0):
 endif;
 ?>
 <h2><?php echo sprintf(__('Release Notes for CakePHP %s.', true), Configure::version()); ?></h2>
-<a href="http://cakephp.lighthouseapp.com/projects/42648/changelog-1-2-6"><?php __('Read the changelog'); ?> </a>
+<a href="http://cakephp.lighthouseapp.com/projects/42648/changelog-1-2-7"><?php __('Read the changelog'); ?> </a>
 <?php
 if (Configure::read() > 0):
 	Debugger::checkSessionKey();

From d9f7b9b4aef373693612495f82a15bdc69b2d0d9 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Fri, 23 Apr 2010 23:05:08 +1000
Subject: [PATCH 237/244] Updating version number to 1.2.7

---
 cake/VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/VERSION.txt b/cake/VERSION.txt
index 7e099ec5d..c04c650a7 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -1 +1 @@
-1.2.6
\ No newline at end of file
+1.2.7

From ba19e0af135b0752c887da056e92e59377d3b88a Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 24 Apr 2010 17:30:00 -0700
Subject: [PATCH 238/244] Adding tests for passed arguments with dots when
 parseExtensions() has been called.  Refs #620

---
 cake/tests/cases/libs/router.test.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index 409ef9e7b..ce3321562 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -1502,6 +1502,22 @@ function testPagesUrlParsing() {
 		$expected = array('pass'=>array('contact'), 'named' => array(), 'plugin'=> null, 'controller'=>'pages', 'action'=>'display');
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * test that requests with a trailing dot don't loose the do.
+ *
+ * @return void
+ */
+	function testParsingWithTrailingPeriodAndParseExtensions() {
+		Router::reload();
+		Router::parseExtensions('json');
+
+		$result = Router::parse('/posts/view/something.');
+		$this->assertEqual($result['pass'][0], 'something.', 'Period was chopped off %s');
+
+		$result = Router::parse('/posts/view/something. . .');
+		$this->assertEqual($result['pass'][0], 'something. . .', 'Period was chopped off %s');
+	}
+
 /**
  * testParsingWithPrefixes method
  *

From ca32f0ffa2ce5f7f35d79cc7b6a2c421c3168c3c Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 24 Apr 2010 10:42:19 -0700
Subject: [PATCH 239/244] Adding tests for dispatcher to show periods not being
 removed.  Refs #620

---
 cake/tests/cases/dispatcher.test.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php
index c4996fc4a..2e28e80d2 100644
--- a/cake/tests/cases/dispatcher.test.php
+++ b/cake/tests/cases/dispatcher.test.php
@@ -1296,6 +1296,11 @@ function testDispatch() {
 		$url = 'test_dispatch_pages/camelCased';
 		$controller = $Dispatcher->dispatch($url, array('return' => 1));
 		$this->assertEqual('TestDispatchPages', $controller->name);
+	
+		$url = 'test_dispatch_pages/camelCased/something. .';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+		$this->assertEqual($controller->params['pass'][0], 'something. .', 'Period was chopped off. %s');
+		
 	}
 /**
  * testDispatchWithArray method

From c87e233500f7807a772896f093f2616a4f276650 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Sat, 24 Apr 2010 10:40:15 -0700
Subject: [PATCH 240/244] Adding tests that show that Router is not chopping
 off periods from passed arguments. Refs #620

---
 cake/tests/cases/libs/router.test.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index ce3321562..0cd6634be 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -1518,6 +1518,20 @@ function testParsingWithTrailingPeriodAndParseExtensions() {
 		$this->assertEqual($result['pass'][0], 'something. . .', 'Period was chopped off %s');
 	}
 
+/**
+ * test that requests with a trailing dot don't loose the do.
+ *
+ * @return void
+ */
+	function testParsingWithTrailingPeriod() {
+		Router::reload();
+		$result = Router::parse('/posts/view/something.');
+		$this->assertEqual($result['pass'][0], 'something.', 'Period was chopped off %s');
+
+		$result = Router::parse('/posts/view/something. . .');
+		$this->assertEqual($result['pass'][0], 'something. . .', 'Period was chopped off %s');
+	}
+
 /**
  * testParsingWithPrefixes method
  *

From 4e720d628514d84a832c4b73b3962c54b1e36d25 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Tue, 27 Apr 2010 23:03:19 -0400
Subject: [PATCH 241/244] Fixing inflection of words ending in analysis.  Fixes
 #619

---
 cake/libs/inflector.php                  | 2 +-
 cake/tests/cases/libs/inflector.test.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index 4012b1a8d..73a73960e 100644
--- a/cake/libs/inflector.php
+++ b/cake/libs/inflector.php
@@ -298,7 +298,7 @@ function __initSingularRules() {
 			'/(drive)s$/i' => '\1',
 			'/([^fo])ves$/i' => '\1fe',
 			'/(^analy)ses$/i' => '\1sis',
-			'/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
+			'/(analy|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
 			'/([ti])a$/i' => '\1um',
 			'/(p)eople$/i' => '\1\2erson',
 			'/(m)en$/i' => '\1an',
diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php
index b896805a3..7fd758213 100644
--- a/cake/tests/cases/libs/inflector.test.php
+++ b/cake/tests/cases/libs/inflector.test.php
@@ -109,6 +109,10 @@ function testInflectingSingulars() {
 		$this->assertEqual(Inflector::singularize('waxes'), 'wax');
 		$this->assertEqual(Inflector::singularize('waves'), 'wave');
 		$this->assertEqual(Inflector::singularize('bureaus'), 'bureau');
+		$this->assertEqual(Inflector::singularize('genetic_analyses'), 'genetic_analysis');
+		$this->assertEqual(Inflector::singularize('doctor_diagnoses'), 'doctor_diagnosis');
+		$this->assertEqual(Inflector::singularize('parantheses'), 'paranthesis');
+
 		$this->assertEqual(Inflector::singularize(''), '');
 	}
 /**

From b079922b8fd7778ae64d0136088689d7d2f933ee Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Mon, 3 May 2010 22:31:55 -0400
Subject: [PATCH 242/244] Making Sanitize::stripScripts() to remove multi-line
 script and style blocks.  Fixes #657

---
 cake/libs/sanitize.php                  |  2 +-
 cake/tests/cases/libs/sanitize.test.php | 28 ++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/cake/libs/sanitize.php b/cake/libs/sanitize.php
index c36d39853..4f91b7f86 100644
--- a/cake/libs/sanitize.php
+++ b/cake/libs/sanitize.php
@@ -131,7 +131,7 @@ function stripImages($str) {
  * @static
  */
 	function stripScripts($str) {
-		return preg_replace('/(<link[^>]+rel="[^"]*stylesheet"[^>]*>|<img[^>]*>|style="[^"]*")|<script[^>]*>.*?<\/script>|<style[^>]*>.*?<\/style>|<!--.*?-->/i', '', $str);
+		return preg_replace('/(<link[^>]+rel="[^"]*stylesheet"[^>]*>|<img[^>]*>|style="[^"]*")|<script[^>]*>.*?<\/script>|<style[^>]*>.*?<\/style>|<!--.*?-->/is', '', $str);
 	}
 /**
  * Strips extra whitespace, images, scripts and stylesheets from output
diff --git a/cake/tests/cases/libs/sanitize.test.php b/cake/tests/cases/libs/sanitize.test.php
index 159b409d3..1fdfb69bb 100644
--- a/cake/tests/cases/libs/sanitize.test.php
+++ b/cake/tests/cases/libs/sanitize.test.php
@@ -321,8 +321,34 @@ function testStripScripts() {
 		$expected = '';
 		$result = Sanitize::stripScripts($string);
 		$this->assertEqual($result, $expected);
+
+		$string = <<<HTML
+text
+<style type="text/css">
+<!-- 
+#content { display:none; } 
+-->
+</style>
+text
+HTML;
+		$expected = "text\n\ntext";
+		$result = Sanitize::stripScripts($string);
+		$this->assertEqual($result, $expected);
+
+		$string = <<<HTML
+text
+<script type="text/javascript">
+<!-- 
+alert('wooo');
+-->
+</script>
+text
+HTML;
+		$expected = "text\n\ntext";
+		$result = Sanitize::stripScripts($string);
+		$this->assertEqual($result, $expected);
 	}
-	/**
+/**
  * testStripAll method
  *
  * @access public

From 99253c22f3a68065a37b9736fd500ec42be3d3c5 Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Thu, 6 May 2010 23:35:38 +1000
Subject: [PATCH 243/244] Update default core.php to include instructions for
 Session names.

---
 app/config/core.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/config/core.php b/app/config/core.php
index 8e0a6c556..e2b5bb951 100644
--- a/app/config/core.php
+++ b/app/config/core.php
@@ -115,6 +115,12 @@
 	//Configure::write('Session.database', 'default');
 /**
  * The name of CakePHP's session cookie.
+ *
+ * Note the guidelines for Session names states: "The session name references
+ * the session id in cookies and URLs. It should contain only alphanumeric
+ * characters; it should be short and descriptive (i.e. for users with enabled
+ * cookie warnings). "
+ * @link http://au.php.net/session_name
  */
 	Configure::write('Session.cookie', 'CAKEPHP');
 /**

From b8a98e2989afe9c90e6959a1a1a935225a5f2efa Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Thu, 6 May 2010 23:43:54 +1000
Subject: [PATCH 244/244] Fixing PHP link for Session information in core.php
 and removing unnecessary quotation.

---
 app/config/core.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/config/core.php b/app/config/core.php
index e2b5bb951..72bbbbadc 100644
--- a/app/config/core.php
+++ b/app/config/core.php
@@ -118,9 +118,8 @@
  *
  * Note the guidelines for Session names states: "The session name references
  * the session id in cookies and URLs. It should contain only alphanumeric
- * characters; it should be short and descriptive (i.e. for users with enabled
- * cookie warnings). "
- * @link http://au.php.net/session_name
+ * characters."
+ * @link http://php.net/session_name
  */
 	Configure::write('Session.cookie', 'CAKEPHP');
 /**