Revert "partials can now also be resolved relative to the containing …

…template, this makes using Mu without setting the global root and just using absolute paths easier"

This reverts commit 4aad0f9.

Conflicts:

	lib/mu.js

lib/mu.js

@@ -11,34 +11,9 @@ var mu = module.exports = {};
 mu.root = process.cwd();
 mu.cache = {};
 
-mu.fs = function (filename, dirname, callback) {
-  // dirname is optional, so we shift the arguments if it is omitted
-  if (!callback) {
-    callback = dirname;
-    dirname = undefined;
-  }
-
-  var filenames = [];
-  if (filename.indexOf('/') === 0 || filename.indexOf(':\\') === 1) {
-    filenames.push(filename);
-  } else {
-    filenames.push(path.join(mu.root, filename));
-    if (dirname) {
-      filenames.push(path.join(dirname, filename));
-    }
-  }
-
-  (function next() {
-    var file = filenames.shift();
-    if (file) {
-      fs.readFile(file, 'utf8', function (err, contents) {
-        if (err) next();
-        else callback(undefined, contents, file);
-      });
-    } else {
-      callback(new Error('file_not_found'));
-    }
-  }());
+mu.fs = function (filename, callback) {
+  filename = filename.indexOf('/') === 0 || filename.indexOf(':\\') === 1 ? filename : path.join(mu.root, filename);
+  fs.readFile(filename, 'utf8', callback);
 }
 
 /**
@@ -49,14 +24,12 @@ mu.fs = function (filename, dirname, callback) {
  *        starts with a '/', the file is assumed to be absolute, else it is
  *        relative to mu.root.
  * @param {Function(err, Parsed)} callback The function to call when the file has been compiled.
- * @param {Object} unique
- * @param {String} dirname Directory to use for relative filename lookups.
  */
-mu.compile = function(filename, callback, unique, dirname) {
+mu.compile = function(filename, callback, unique) {
   var parsed,
       unique = unique || {};
 
-  mu.fs(filename, dirname, function (err, contents, found) {
+  mu.fs(filename, function (err, contents) {
     if (err) {
       return callback(err);
     }
@@ -71,7 +44,7 @@ mu.compile = function(filename, callback, unique, dirname) {
       }
 
       if (i < parsed.partials.length) {
-        mu.compile(parsed.partials[i], next, unique, path.dirname(found));
+        mu.compile(parsed.partials[i], next, unique);
         i++;
 
       } else {