Merged in luisfernandosl/processmaker/PM-807 (pull request #2019)

PM-807 "Change especify to specify" SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2015-04-27 16:33:15 -04:00
6 changed files with 21 additions and 23 deletions

View File

@@ -463,7 +463,7 @@ class Bootstrap
$filter = new InputFilter();
$file = $filter->xssFilterHard($file);
$downloadFileName = $filter->xssFilterHard($downloadFileName);
$fileNameIni = $file;
$browserCacheFilesUid = G::browserCacheFilesGetUid();
@@ -1376,7 +1376,7 @@ class Bootstrap
{
global $translation;
// if the second parameter $lang is an array does mean it was especified to use as data
// if the second parameter ($lang) is an array, it was specified to use it as data
if (is_array($lang)) {
$data = $lang;
$lang = SYS_LANG;
@@ -1409,7 +1409,7 @@ class Bootstrap
*
* @param $path path to scan recursively the write permission
* @param $flags to notive glob function
* @param $pattern pattern to filter some especified files
* @param $pattern pattern to filter some specified files
* @return <array> array containing the recursive glob results
*/
public function rglob($pattern = '*', $flags = 0, $path = '')
@@ -2894,7 +2894,7 @@ class Bootstrap
if ($hashType == '') {
$hashType = Bootstrap::getPasswordHashType();
}
G::LoadSystem('inputfilter');
$filter = new InputFilter();
$hashType = $filter->validateInput($hashType);
@@ -2934,4 +2934,3 @@ class Bootstrap
return md5($string);
}
}