From 2e4101a54b6fb71cb636870cf484d9739090af88 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Wed, 18 Oct 2006 17:17:29 +0000
Subject: [PATCH] Removed variable from the I18n::translate(); in basics.php
 __() function

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3710 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/basics.php | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/cake/basics.php b/cake/basics.php
index a65a0a1a8..2f36ec8f2 100644
--- a/cake/basics.php
+++ b/cake/basics.php
@@ -1,4 +1,4 @@
-<?php
+Ä<?php
 /* SVN FILE: $Id$ */
 /**
  * Basic Cake functionality.
@@ -1046,10 +1046,11 @@
 		}
 		$calledFrom = debug_backtrace();
 		$dir = dirname($calledFrom[0]['file']);
+
 		if(is_null($return)) {
-			echo I18n::translate($msg, $msg2=NULL, $domain=NULL, $category=NULL, $count=NULL, $dir);
+			echo I18n::translate($msg, null, null, null, null, $dir);
 		} else {
-			return I18n::translate($msg, $msg2=NULL, $domain=NULL, $category=NULL, $count=NULL, $dir);
+			return I18n::translate($msg, null, null, null, null, $dir);
 		}
 	}
 /**
@@ -1069,10 +1070,11 @@
 		}
 		$calledFrom = debug_backtrace();
 		$dir = dirname($calledFrom[0]['file']);
+
 		if(is_null($return)) {
-			echo I18n::translate($msg1, $msg2, NULL, NULL, $count, $dir);
+			echo I18n::translate($msg1, $msg2, null, null, $count, $dir);
 		} else {
-			return I18n::translate($msg1, $msg2, NULL, NULL, $count, $dir);
+			return I18n::translate($msg1, $msg2, null, null, $count, $dir);
 		}
 	}
 /**
@@ -1094,10 +1096,11 @@
 		}
 		$calledFrom = debug_backtrace();
 		$dir = dirname($calledFrom[0]['file']);
+
 		if(is_null($return)) {
-			echo I18n::translate($msg1, $msg2, $domain, NULL, $count, $dir);;
+			echo I18n::translate($msg1, $msg2, $domain, null, $count, $dir);;
 		} else {
-			return I18n::translate($msg1, $msg2, $domain, NULL, $count, $dir);
+			return I18n::translate($msg1, $msg2, $domain, null, $count, $dir);
 		}
 	}
 /**
@@ -1133,6 +1136,7 @@
 		}
 		$calledFrom = debug_backtrace();
 		$dir = dirname($calledFrom[0]['file']);
+
 		if(is_null($return)) {
 			echo I18n::translate($msg1, $msg2, $domain, $category, $count, $dir);
 		} else {
@@ -1168,10 +1172,11 @@
 		}
 		$calledFrom = debug_backtrace();
 		$dir = dirname($calledFrom[0]['file']);
+
 		if(is_null($return)) {
-			echo I18n::translate($msg, NULL, $domain, $category, NULL, $dir);
+			echo I18n::translate($msg, null, $domain, $category, null, $dir);
 		} else {
-			return I18n::translate($msg, NULL, $domain, $category, NULL, $dir);
+			return I18n::translate($msg, null, $domain, $category, null, $dir);
 		}
 	}
 /**
@@ -1189,10 +1194,11 @@
 		}
 		$calledFrom = debug_backtrace();
 		$dir = dirname($calledFrom[0]['file']);
+
 		if(is_null($return)) {
-			echo I18n::translate($msg, NULL, $domain, NULL, NULL, $dir);
+			echo I18n::translate($msg, null, $domain, null, null, $dir);
 		} else {
-			return I18n::translate($msg, NULL, $domain, NULL, NULL, $dir);
+			return I18n::translate($msg, null, $domain, null, null, $dir);
 		}
     }
 /**