update changelog and fix cs

This commit is contained in:
Manuel Raynaud
2014-02-22 19:01:37 +01:00
parent b833b4a5b6
commit a5cfcf91ca
590 changed files with 21397 additions and 24262 deletions

View File

@@ -22,15 +22,16 @@ class Content extends BaseContent
/**
* {@inheritDoc}
*/
protected function getRewrittenUrlViewName() {
protected function getRewrittenUrlViewName()
{
return 'content';
}
/**
* Calculate next position relative to our parent
*/
protected function addCriteriaToPositionQuery($query) {
protected function addCriteriaToPositionQuery($query)
{
// TODO: Find the default folder for this content,
// and generate the position relative to this folder
}
@@ -55,7 +56,6 @@ class Content extends BaseContent
return $this;
}
public function updateDefaultFolder($defaultFolderId)
{
// Allow uncategorized content (NULL instead of 0, to bypass delete cascade constraint)
@@ -118,7 +118,7 @@ class Content extends BaseContent
$con->commit();
$this->dispatchEvent(TheliaEvents::AFTER_CREATECONTENT,new ContentEvent($this));
} catch(\Exception $ex) {
} catch (\Exception $ex) {
$con->rollback();
@@ -126,7 +126,6 @@ class Content extends BaseContent
}
}
public function preUpdate(ConnectionInterface $con = null)
{
$this->dispatchEvent(TheliaEvents::BEFORE_UPDATECONTENT, new ContentEvent($this));