git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
issue: wrap items to allow containment
[minimedit.git]
/
article.inc.php
diff --git
a/article.inc.php
b/article.inc.php
index a39b8971c3546cc236a84fbd63b44571de780064..d42e49823c96b2536613c806f5399194b7b6c414 100644
(file)
--- a/
article.inc.php
+++ b/
article.inc.php
@@
-157,9
+157,12
@@
class PageSearch
# ignore symlinks, original contents only
return FALSE;
}
# ignore symlinks, original contents only
return FALSE;
}
+ if ($current->isDir()) {
+ # traverse subdirectories unless untracked in any amount
+ return !file_exists("$current/.gitignore");
+ }
# match **/*.html
# match **/*.html
- return $current->isDir()
- || preg_match('/\.html$/', $current->getFilename());
+ return preg_match('/(?<!\.inc)\.html$/', $current->getFilename());
}
);
}
}
);
}