get_files_from_argument() applies path to strings/arrays too. closes #9

indeyets · Jul 17, 2012 · d600cb1 · d600cb1
1 parent 6aba14d
commit d600cb1
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/lib/pake/pakeFinder.class.php b/lib/pake/pakeFinder.class.php
@@ -620,9 +620,19 @@ public static function get_files_from_argument($arg, $target_dir = '', $relative
  $files = array();
 
  if (is_array($arg)) {
- $files = $arg;
+ if (strlen($target_dir) > 0) {
+ foreach ($arg as $path) {
+ $files[] = $target_dir.'/'.$path;
+ }
+ } else {
+ $files = $arg;
+ }
  } elseif (is_string($arg)) {
- $files[] = $arg;
+ if (strlen($target_dir) > 0) {
+ $files[] = $target_dir.'/'.$arg;
+ } else {
+ $files[] = $arg;
+ }
  } elseif ($arg instanceof pakeFinder) {
  /** @var $arg pakeFinder */
  $files = $arg->in($target_dir);