From 322a47d526e56b8a6ef2ff9ab889ac5f391e2479 Mon Sep 17 00:00:00 2001 From: David Monllao Date: Wed, 12 Mar 2014 17:49:55 +0800 Subject: [PATCH] MDL-43266 testing: Removing duplicated keys --- lib/testing/classes/util.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/testing/classes/util.php b/lib/testing/classes/util.php index 7b425609b0d..e414384996b 100755 --- a/lib/testing/classes/util.php +++ b/lib/testing/classes/util.php @@ -861,18 +861,19 @@ abstract class testing_util { if (!file_exists($jsonfilepath)) { $listfiles = array(); - $listfiles[] = 'filedir/.'; - $listfiles[] = 'filedir/..'; + $listfiles['filedir/.'] = 'filedir/.'; + $listfiles['filedir/..'] = 'filedir/..'; $filedir = self::get_dataroot() . '/filedir'; if (file_exists($filedir)) { $directory = new RecursiveDirectoryIterator($filedir); foreach (new RecursiveIteratorIterator($directory) as $file) { if ($file->isDir()) { - $listfiles[] = substr($file->getPath(), strlen(self::get_dataroot() . '/')); + $key = substr($file->getPath(), strlen(self::get_dataroot() . '/')); } else { - $listfiles[] = substr($file->getPathName(), strlen(self::get_dataroot() . '/')); + $key = substr($file->getPathName(), strlen(self::get_dataroot() . '/')); } + $listfiles[$key] = $key; } }