9ce0cac4cc969ac96b090b7ce9cfa99177d3de04
Author: Mark Story
Date: 2009-02-05 21:08:37 -0500
diff --cc controllers/api_generator_controller.php
index b8f9cdb,4297a25..a05dfd2
--- a/controllers/api_generator_controller.php
+++ b/controllers/api_generator_controller.php
@@@ -120,9 -120,13 +120,8 @@@ class ApiGeneratorController extends Ap
} catch(Exception $e) {
$this->_notFound($e->getMessage());
}
-<<<<<<< HEAD:controllers/api_generator_controller.php
- $classIndex = $this->ApiClass->getClassIndex();
-=======
$classIndex = $this->ApiClass->getClassIndex(true);
->>>>>>> f8f31dc4a4af2f47f38261e3371aaafae3fc1e4d:controllers/api_generator_controller.php
list($dirs, $files) = $this->ApiFile->read($this->path . $previousPath);
--
if (!empty($docs)) {
$this->set('showSidebar', true);
$this->set('sidebarElement', 'sidebar/file_sidebar');
