Upgrade to KH 3.3.0
This commit is contained in:
@@ -1,19 +1,19 @@
|
||||
<?php defined('SYSPATH') or die('No direct script access.');
|
||||
|
||||
// Static file serving (CSS, JS, images)
|
||||
Route::set('docs/media', 'guide/media(/<file>)', array('file' => '.+'))
|
||||
Route::set('docs/media', 'guide-media(/<file>)', array('file' => '.+'))
|
||||
->defaults(array(
|
||||
'controller' => 'userguide',
|
||||
'controller' => 'Userguide',
|
||||
'action' => 'media',
|
||||
'file' => NULL,
|
||||
));
|
||||
|
||||
// API Browser, if enabled
|
||||
if (Kohana::config('userguide.api_browser') === TRUE)
|
||||
if (Kohana::$config->load('userguide.api_browser') === TRUE)
|
||||
{
|
||||
Route::set('docs/api', 'guide/api(/<class>)', array('class' => '[a-zA-Z0-9_]+'))
|
||||
Route::set('docs/api', 'guide-api(/<class>)', array('class' => '[a-zA-Z0-9_]+'))
|
||||
->defaults(array(
|
||||
'controller' => 'userguide',
|
||||
'controller' => 'Userguide',
|
||||
'action' => 'api',
|
||||
'class' => NULL,
|
||||
));
|
||||
@@ -24,7 +24,21 @@ Route::set('docs/guide', 'guide(/<module>(/<page>))', array(
|
||||
'page' => '.+',
|
||||
))
|
||||
->defaults(array(
|
||||
'controller' => 'userguide',
|
||||
'controller' => 'Userguide',
|
||||
'action' => 'docs',
|
||||
'module' => '',
|
||||
));
|
||||
));
|
||||
|
||||
// Simple autoloader used to encourage PHPUnit to behave itself.
|
||||
class Markdown_Autoloader {
|
||||
public static function autoload($class)
|
||||
{
|
||||
if ($class == 'Markdown_Parser' OR $class == 'MarkdownExtra_Parser')
|
||||
{
|
||||
include_once Kohana::find_file('vendor', 'markdown/markdown');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Register the autoloader
|
||||
spl_autoload_register(array('Markdown_Autoloader', 'autoload'));
|
||||
|
Reference in New Issue
Block a user