Поправил регистр
This commit is contained in:
parent
d63cb2913f
commit
53b531f853
8 changed files with 9 additions and 10 deletions
|
|
@ -331,6 +331,7 @@ class Controller_Action
|
|||
if ($this->view instanceof View_View) {
|
||||
$this->view->assignValues($this->ctrlValues);
|
||||
|
||||
/*.Widgets_Widget.*/$node = null;
|
||||
foreach ($this->childNodes as $name => $node) {
|
||||
$node->make($this);
|
||||
$this->view->setView($name, $node->view);
|
||||
|
|
|
|||
|
|
@ -271,10 +271,9 @@ class Controller_Component
|
|||
if(class_exists("Controller_Site")){ //Если мы в CMS2
|
||||
$instance = Controller_Site::getInstance();
|
||||
$instance->componentsConfig[] = $editor;
|
||||
}else{
|
||||
} else {
|
||||
global $componentsConfig;
|
||||
$componentsConfig[] = $editor;
|
||||
|
||||
$componentsConfig[] = $editor;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
///<reference path="Database/PDOStatement.php" />
|
||||
require_once "Database/PDOStatement.php";
|
||||
|
||||
/**
|
||||
* Класс оболочка для PDO для замены Creole
|
||||
*/
|
||||
|
|
@ -81,7 +82,7 @@ class Database extends PDO
|
|||
/**
|
||||
* Извлекает из базы первый элемент по запросу
|
||||
*/
|
||||
public function fetchOneArray($query,$values=null)
|
||||
public function fetchOneArray($query, $values = null)
|
||||
{
|
||||
/*.Database_PDOStatement.*/$sth = $this->prepare($query);
|
||||
$prep = $this->prepareValues($values);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
<?php
|
||||
|
||||
require_once __DIR__ .'/../Tools/String.php';
|
||||
|
||||
class Database_PDOStatement extends PDOStatement implements IteratorAggregate
|
||||
{
|
||||
protected $cursorPos = 0;
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ class Path
|
|||
*
|
||||
* @return array
|
||||
*/
|
||||
public static function listFromString ($path)
|
||||
public static function listFromString($path)
|
||||
{
|
||||
assert(is_string($path));
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
///<reference path="settings.php" />
|
||||
///<reference path="Settings.php" />
|
||||
|
||||
/**
|
||||
* http://www.patternsforphp.com/wiki/Registry
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
///<reference path="rule/notnull.php"/>
|
||||
///<reference path="Rule/Notnull.php"/>
|
||||
|
||||
/**
|
||||
* Проверка коллекции
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ function phptal_component ($expression) {
|
|||
$begin = floatval(microtime(true));
|
||||
/*.Controller_Component.*/$component = null;
|
||||
|
||||
if(class_exists("Controller_Site")){ //Если мы в CMS2
|
||||
if (class_exists("Controller_Site")) { //Если мы в CMS2
|
||||
$component = Controller_Site::loadComponent($expression);
|
||||
} else {
|
||||
global $db, $registry; // Иначе обращаемся к глобальным переменным
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue