Fixed merge errors

troelskn · Dec 25, 2010 · fbb4cbb · fbb4cbb
1 parent bec347b
commit fbb4cbb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/bin/phrocco b/bin/phrocco
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-require_once dirname(__DIR__) . '/phrocco.php';
+require_once dirname(dirname(__FILE__)) . '/phrocco.php';
 ini_set("error_reporting",247);
 
 if (count($argv)>1) {

diff --git a/phrocco.php b/phrocco.php
@@ -27,8 +27,8 @@ public function parse() {
     public function render() {
         ob_start();
         $this->parse();
-        $view_file = __DIR__."/lib/template/layout.html";
-        $this->style = file_get_contents(__DIR__."/lib/template/layout.css");
+        $view_file = dirname(__FILE__)."/lib/template/layout.html";
+        $this->style = file_get_contents(dirname(__FILE__)."/lib/template/layout.css");
         extract((array)$this);
 
       	if(!is_readable($view_file)) throw new Exception("Unable to find Template File");