adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-02 17:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed variable from the I18n::translate(); in basics.php __() function

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3710 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-10-18 17:17:29 +00:00
parent 57f27126bd
commit 2e4101a54b
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
cake/basics.php
View file

@ -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);
}
}
/**