Added extra & of bib.loc line so that if the first argument does not …

…occur R will not attempt the second.
trinker · Feb 25, 2013 · c5d759b · c5d759b
1 parent ae59ae7
commit c5d759b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/R/new_report.R b/R/new_report.R
@@ -111,7 +111,7 @@ new_report <- function(report = "report", template = "apa6.mod.qual_tex",
             paste0("source(\"", rpro3, "\")"))
     }
     bib <- NULL
-    if(!is.null(bib.loc) & file.exists(bib.loc)){
+    if(!is.null(bib.loc) && file.exists(bib.loc)){
         invisible(file.copy(bib.loc, y[[1]]))
         invisible(file.copy(bib.loc, y[[4]]))
         bib <- dir(y[[1]])[tools::file_ext(dir(y[[1]])) == "bib"]

diff --git a/R/presentation.R b/R/presentation.R
@@ -90,7 +90,7 @@ presentation <- function(presentation = "presentation", rnw = TRUE,
     invisible(file.copy(file.path(root, "TEMP.txt"), x))
     invisible(file.rename(file.path(x, "TEMP.txt"), 
         file.path(x, paste0(presentation, ".Rproj"))))
-    if(!is.null(bib.loc) & file.exists(bib.loc)){
+    if(!is.null(bib.loc) && file.exists(bib.loc)){
         invisible(file.copy(bib.loc, y[[2]]))
         bib <- dir(y[[2]])[tools::file_ext(dir(y[[2]])) == "bib"]
         if (!is.null(getOption("bib.loc"))) {