Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Hotfix] Fix Area\Layout::loadColumnNumber #2653

Merged
merged 3 commits into from Jul 6, 2015
Merged

[Hotfix] Fix Area\Layout::loadColumnNumber #2653

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37abc2c
Fix Area\Layout::loadColumnNumber
mlocati Jul 2, 2015
d870dd3
PSR
mlocati Jul 2, 2015
8e1e971
Core::make/Database::connection instead of Loader
mlocati Jul 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 21 additions & 15 deletions web/concrete/src/Area/Layout/Layout.php
View file
Open in desktop
@@ -1,14 +1,15 @@
<?php

namespace Concrete\Core\Area\Layout;

use Loader;
use \Concrete\Core\Foundation\Object;
use Core;
use Database;
use Concrete\Core\Foundation\Object;
use Area;
use Concrete\Core\Block\Block;

abstract class Layout extends Object
{

/**
* @var Area
*/
Expand Down Expand Up @@ -36,33 +37,35 @@ abstract class Layout extends Object

/**
* @param int $arLayoutID
*
* @return CustomLayout|ThemeGridLayout|null
*/
public static function getByID($arLayoutID)
{
$db = Loader::db();
$db = Database::connection();
$row = $db->GetRow('select arLayoutID, arLayoutIsPreset, arLayoutUsesThemeGridFramework from AreaLayouts where arLayoutID = ?', array($arLayoutID));
if (is_array($row) && $row['arLayoutID']) {
if ($row['arLayoutUsesThemeGridFramework']) {
$al = new ThemeGridLayout();
} else if ($row['arLayoutIsPreset']) {
} elseif ($row['arLayoutIsPreset']) {
$al = new PresetLayout();
} else {
$al = new CustomLayout();
}
$al->setPropertiesFromArray($row);
$al->loadDetails();
$al->loadColumnNumber();

return $al;
}
}

protected function loadColumnNumber()
{
$db = Loader::db();
$this->arLayoutNumColumns = $db->GetOne('select count(arLayoutColumnID) as totalColumns from AreaLayoutColumns where arLayoutID = ?', array($arLayoutID));
$db = Database::connection();
$this->arLayoutNumColumns = $db->GetOne('select count(arLayoutColumnID) as totalColumns from AreaLayoutColumns where arLayoutID = ?', array($this->arLayoutID));
}

/**
* @param Area $a
*/
Expand Down Expand Up @@ -124,17 +127,18 @@ public function getAreaLayoutNumColumns()
*/
public function getAreaLayoutColumns()
{
$db = Loader::db();
$db = Database::connection();
$r = $db->Execute('select arLayoutColumnID from AreaLayoutColumns where arLayoutID = ? order by arLayoutColumnIndex asc', array($this->arLayoutID));
$columns = array();
$class = '\\Concrete\\Core\\Area\\Layout\\' . Loader::helper('text')->camelcase($this->arLayoutType) . 'Column';
$class = '\\Concrete\\Core\\Area\\Layout\\' . Core::make('helper/text')->camelcase($this->arLayoutType) . 'Column';
while ($row = $r->FetchRow()) {
$column = call_user_func_array(array($class, 'getByID'), array($row['arLayoutColumnID']));
if (is_object($column)) {
$column->setAreaLayoutObject($this);
$columns[] = $column;
}
}

return $columns;
}

Expand All @@ -143,16 +147,17 @@ public function getAreaLayoutColumns()
*/
public function addLayoutColumn()
{
$db = Loader::db();
$db = Database::connection();
$arLayoutColumnDisplayID = $db->GetOne('select max(arLayoutColumnDisplayID) as arLayoutColumnDisplayID from AreaLayoutColumns');
if ($arLayoutColumnDisplayID) {
$arLayoutColumnDisplayID++;
++$arLayoutColumnDisplayID;
} else {
$arLayoutColumnDisplayID = 1;
}
$index = $db->GetOne('select count(arLayoutColumnID) from AreaLayoutColumns where arLayoutID = ?', array($this->arLayoutID));
$db->Execute('insert into AreaLayoutColumns (arLayoutID, arLayoutColumnIndex, arLayoutColumnDisplayID) values (?, ?, ?)', array($this->arLayoutID, $index, $arLayoutColumnDisplayID));
$arLayoutColumnID = $db->Insert_ID();

return $arLayoutColumnID;
}

Expand Down Expand Up @@ -183,7 +188,7 @@ public function delete()
foreach ($columns as $col) {
$col->delete();
}
$db = Loader::db();
$db = Database::connection();
$db->Execute('delete from AreaLayouts where arLayoutID = ?', array($this->arLayoutID));
$db->Execute('delete from AreaLayoutPresets where arLayoutID = ?', array($this->arLayoutID));
}
Expand All @@ -194,8 +199,9 @@ public function delete()
public function getFormatter()
{
$class = '\\Concrete\\Core\\Area\\Layout\\' .
'Formatter\\' . \Loader::helper('text')->camelcase($this->arLayoutType) . 'Formatter';
'Formatter\\' . Core::make('helper/text')->camelcase($this->arLayoutType) . 'Formatter';
$o = new $class($this);

return $o;
}
}
}