Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix

  • Loading branch information...
commit 9c78bb9b46624422dada9b48a303dd6528aafb74 1 parent 5b3a785
@juks authored
Showing with 3 additions and 5 deletions.
  1. +2 −4 index.php
  2. +1 −1  lib/controller.class.php
View
6 index.php
@@ -54,10 +54,8 @@ function __autoload($className){
# Преобразование URL к однозначному виду (foo/bar -> foo/bar/)
$url = !empty($_SERVER['HTTP_REQUEST_URI']) ? $_SERVER['HTTP_REQUEST_URI'] : $_SERVER['REQUEST_URI'];
-if(defined('PROJECT_URL_DEMULTI') && PROJECT_URL_DEMULTI) {
- $path = $url;
- if(!empty($_SERVER['QUERY_STRING'])) $path;
- Box::urlDemultiply($path);
+if (Config::get('app/urlDemultiply')) {
+ Box::urlDemultiply($url);
}
/**
View
2  lib/controller.class.php
@@ -284,7 +284,7 @@ function addContent($key, $value, $extra = null) {
if (empty($this->viewOptions[self::template])) return;
if (!empty($extra['context'])) {
- $this->view->tpl->setContext($extra['context']);
+ $this->view->tpl->context($extra['context']);
} else {
if($this->view->tpl->currentContext() != $this->view->defaultContext) $this->view->tpl->context($this->view->defaultContext);
}
Please sign in to comment.
Something went wrong with that request. Please try again.