Skip to content

Commit 0676031

Browse files
committed
Restored the good part of 74ee335 that was just reverted.
1 parent c6e1545 commit 0676031

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

ext/fileinfo/libmagic/magic.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ private const char *file_or_stream(struct magic_set *, const char *, php_stream
9292
#endif
9393

9494
/* XXX this functionality is excluded in php, enable it in apprentice.c:340 */
95+
#if 0
9596
private const char *
9697
get_default_magic(void)
9798
{
@@ -215,6 +216,7 @@ magic_getpath(const char *magicfile, int action)
215216

216217
return action == FILE_LOAD ? get_default_magic() : MAGIC;
217218
}
219+
#endif
218220

219221
public struct magic_set *
220222
magic_open(int flags)

0 commit comments

Comments
 (0)