Kohana 3.3 fix

This commit is contained in:
Alexander Yakovlev 2012-12-29 19:07:06 +07:00
parent de2c23cdea
commit dcab756ae0
2 changed files with 11 additions and 16 deletions

View file

@ -80,8 +80,8 @@ if (isset($_SERVER['KOHANA_ENV']))
* - boolean caching enable or disable internal caching FALSE * - boolean caching enable or disable internal caching FALSE
*/ */
Kohana::init(array( Kohana::init(array(
'base_url' => '/phunt', 'base_url' => '/',
'index_file' => 'index.php', 'index_file' => FALSE,
'errors' => TRUE, 'errors' => TRUE,
'profile' => (Kohana::$environment == Kohana::DEVELOPMENT), 'profile' => (Kohana::$environment == Kohana::DEVELOPMENT),
'caching' => (Kohana::$environment == Kohana::PRODUCTION) 'caching' => (Kohana::$environment == Kohana::PRODUCTION)
@ -122,13 +122,8 @@ Kohana::modules(array(
* Set the routes. Each route must have a minimum of a name, a URI and a set of * Set the routes. Each route must have a minimum of a name, a URI and a set of
* defaults for the URI. * defaults for the URI.
*/ */
Route::set('error', 'error/<action>(/<message>)', array('action' => '[0-9]++','message' => '.+'))
->defaults(array(
'controller' => 'Error',
));
Route::set('default', '(<controller>(/<action>(/<id>)))') Route::set('default', '(<controller>(/<action>(/<id>)))')
->defaults(array( ->defaults(array(
'controller' => 'Error', 'controller' => 'Error',
'action' => '404', 'action' => 'view',
)); ));

View file

@ -3,10 +3,10 @@
<div id="error"><?php if(!empty($error)) echo $error;?></div> <div id="error"><?php if(!empty($error)) echo $error;?></div>
<div id="message"><?php if(!empty($message)) echo $message;?></div> <div id="message"><?php if(!empty($message)) echo $message;?></div>
<p>Введите логин и пароль для получения доступа к разделу.</p> <p>Введите логин и пароль для получения доступа к разделу.</p>
<?php echo form::open('login') ?> <?php echo Form::open('login') ?>
<p><?php echo form::label('login','Логин: '); echo form::input('login','') ?></p> <p><?php echo Form::label('login','Логин: '); echo Form::input('login','') ?></p>
<p><?php echo form::label('password','Пароль: '); echo form::password('password','') ?></p> <p><?php echo Form::label('password','Пароль: '); echo Form::password('password','') ?></p>
<p><?php echo form::submit('submit','Отправить') ?> <p><?php echo Form::submit('submit','Отправить') ?>
</p> </p>
<?php echo form::close() ?> <?php echo Form::close() ?>
<?php echo Request::factory('footer/standard')->execute() ?> <?php echo Request::factory('footer/standard')->execute() ?>