Bladeren bron

Merge branch 'master' of http://code.travelzs.com:3000/root/Qii

# Conflicts:
#	src/Library/Download.php
Zhu Jinhui 6 jaren geleden
bovenliggende
commit
94f59412ea
1 gewijzigde bestanden met toevoegingen van 1 en 1 verwijderingen
  1. 1 1
      src/Router/Parse/Normal.php

+ 1 - 1
src/Router/Parse/Normal.php

@@ -107,7 +107,7 @@ class Normal
                 $interSet = array_intersect_assoc($configArr, $dir);
                 if($interSet) {
                     $countInterSet = count($interSet);
-                    if($configArr[$countInterSet] == '*' || $configArr[$countInterSet] == $dirInfo[$dirInfo[$key]]) {
+                    if(isset($configArr[$countInterSet]) && ($configArr[$countInterSet] == '*' || (isset($dirInfo[$dirInfo[$key]]) && $configArr[$countInterSet] == $dirInfo[$dirInfo[$key]]))) {
                         if($matchLen < $countInterSet) {
                             $register = ['rule' => $config, 'val' => $val, 'interSet' => $interSet];
                         }else{