Browse Source

ensure apidoc works with relative paths

tags/2.0.1
Carsten Brandt 10 years ago
parent
commit
b809f93b69
  1. 10
      extensions/apidoc/commands/ApiController.php
  2. 10
      extensions/apidoc/commands/GuideController.php

10
extensions/apidoc/commands/ApiController.php

@ -51,11 +51,11 @@ class ApiController extends BaseController
} else {
$guideUrl = './';
$renderer->guideUrl = $targetDir;
}
if (file_exists($renderer->generateGuideUrl('README.md'))) {
$renderer->guideUrl = $guideUrl;
} else {
$renderer->guideUrl = null;
if (file_exists($renderer->generateGuideUrl('README.md'))) {
$renderer->guideUrl = $guideUrl;
} else {
$renderer->guideUrl = null;
}
}
// search for files to process

10
extensions/apidoc/commands/GuideController.php

@ -47,8 +47,14 @@ class GuideController extends BaseController
// setup reference to apidoc
if ($this->apiDocs !== null) {
$renderer->apiUrl = $this->apiDocs;
$renderer->apiContext = $this->loadContext($this->apiDocs);
$path = $this->apiDocs;
$renderer->apiUrl = $path;
// use relative paths relative to targetDir
if (strncmp($path, '.', 1) === 0) {
$renderer->apiContext = $this->loadContext("$targetDir/$path");
} else {
$renderer->apiContext = $this->loadContext($path);
}
} elseif (file_exists($targetDir . '/cache/apidoc.data')) {
$renderer->apiUrl = './';
$renderer->apiContext = $this->loadContext($targetDir);

Loading…
Cancel
Save