Revert "T.P.App.Opt: fix logic bug in fullDefaultsPath."

This reverts commit 545c0911aa5d7d91280c5213c6d57b3e634ef1e5.

Fixes regression in 2.17.1.

The original commit was completely misguided, and caused
problems finding defaults files in the default user data
directory.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/Text/Pandoc/App/Opt.hs b/src/Text/Pandoc/App/Opt.hs
index 2b3494022..4f5474c4f 100644
--- a/src/Text/Pandoc/App/Opt.hs
+++ b/src/Text/Pandoc/App/Opt.hs
@@ -707,10 +707,9 @@ fullDefaultsPath dataDir file = do
   let fp = if null (takeExtension file)
               then addExtension file "yaml"
               else file
-  let searchpath = fp : case dataDir of
-                          Nothing -> []
-                          Just d  -> [d </> "defaults" </> fp]
-  fromMaybe fp <$> findM fileExists searchpath
+  defaultDataDir <- liftIO defaultUserDataDir
+  let defaultFp = fromMaybe defaultDataDir dataDir </> "defaults" </> fp
+  fromMaybe fp <$> findM fileExists [fp, defaultFp]
 
 -- | In a list of lists, append another list in front of every list which
 -- starts with specific element.