changeset 95:8a9bfbe220ca

Branch merge.
author Tom Fredrik "BFG" Klaussen <bfg@blenning.no>
date Thu, 18 Oct 2012 17:40:21 +0200
parents 2370f4450983
children c7de7a4641d7
files Sitemap.inc sitemap.php
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Sitemap.inc	Thu Oct 18 17:33:34 2012 +0200
+++ b/Sitemap.inc	Thu Oct 18 17:40:21 2012 +0200
@@ -56,10 +56,10 @@
     $acceptedLanguages = $this->options->getAcceptedLanguages();
 
     foreach($this->options->getAcceptedLanguages() as $lang) {
-      if ($handle = opendir("${lang}")) {
+      if ($handle = opendir(basePath() . "/${lang}")) {
 	while (false !== ($entry = readdir($handle))) {
 	  if (endsWith($entry, '.xml')) {
-	    $fentry = "${lang}/${entry}";
+	    $fentry = basepath() . "/${lang}/${entry}";
 	    $doc = new DOMDocument();
 
 	    if (file_exists($fentry)) {
--- a/sitemap.php	Thu Oct 18 17:33:34 2012 +0200
+++ b/sitemap.php	Thu Oct 18 17:40:21 2012 +0200
@@ -12,7 +12,7 @@
 $cache->includeOnce('Sitemap.inc', dirname(__FILE__));
 
 try {
-  $sitemap = new Sitemap("master.xml");
+  $sitemap = new Sitemap(basePath() . "/master.xml");
   $sitemap->display();
 }
 catch (Exception $e) {