Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge

  • Loading branch information...
commit e56281e1da869102b6772a0f54c2b08ed03a93db 1 parent c45badf
@marcoraddatz authored
View
28 vendor/candyCMS/core/controllers/Blogs.controller.php
@@ -25,8 +25,8 @@ class Blogs extends Main {
*
*/
protected function _show() {
- $sTemplateDir = Helper::getTemplateDir($this->_aRequest['controller'], 'show');
- $sTemplateFile = Helper::getTemplateType($sTemplateDir, 'show');
+ $sTemplateDir = Helper::getTemplateDir($this->_aRequest['controller'], 'show');
+ $sTemplateFile = Helper::getTemplateType($sTemplateDir, 'show');
if ($this->_iId) {
$this->_aData = $this->_oModel->getData($this->_iId);
@@ -133,7 +133,7 @@ private function _setBlogsTitle() {
*
*/
protected function _showFormTemplate() {
- $sTemplateDir = Helper::getTemplateDir($this->_aRequest['controller'], '_form');
+ $sTemplateDir = Helper::getTemplateDir($this->_aRequest['controller'], '_form');
$sTemplateFile = Helper::getTemplateType($sTemplateDir, '_form');
# Update
@@ -144,13 +144,13 @@ protected function _showFormTemplate() {
# Create
else {
- $aData['content'] = isset($this->_aRequest['content']) ? $this->_aRequest['content'] : '';
- $aData['keywords'] = isset($this->_aRequest['keywords']) ? $this->_aRequest['keywords'] : '';
- $aData['language'] = isset($this->_aRequest['language']) ? $this->_aRequest['language'] : '';
+ $aData['content'] = isset($this->_aRequest['content']) ? $this->_aRequest['content'] : '';
+ $aData['keywords'] = isset($this->_aRequest['keywords']) ? $this->_aRequest['keywords'] : '';
+ $aData['language'] = isset($this->_aRequest['language']) ? $this->_aRequest['language'] : '';
$aData['published'] = isset($this->_aRequest['published']) ? $this->_aRequest['published'] : '';
- $aData['tags'] = isset($this->_aRequest['tags']) ? $this->_aRequest['tags'] : '';
- $aData['teaser'] = isset($this->_aRequest['teaser']) ? $this->_aRequest['teaser'] : '';
- $aData['title'] = isset($this->_aRequest['title']) ? $this->_aRequest['title'] : '';
+ $aData['tags'] = isset($this->_aRequest['tags']) ? $this->_aRequest['tags'] : '';
+ $aData['teaser'] = isset($this->_aRequest['teaser']) ? $this->_aRequest['teaser'] : '';
+ $aData['title'] = isset($this->_aRequest['title']) ? $this->_aRequest['title'] : '';
}
$this->oSmarty->assign('_tags_', $this->_oModel->getTypeaheadData('blogs', 'tags', true));
@@ -167,13 +167,13 @@ protected function _showFormTemplate() {
closedir($oPathDir);
foreach ($aData as $sColumn => $sData)
- $this->oSmarty->assign($sColumn, $sData);
+ $this->oSmarty->assign($sColumn, $sData);
- if ($this->_aError)
- $this->oSmarty->assign('error', $this->_aError);
+ if ($this->_aError)
+ $this->oSmarty->assign('error', $this->_aError);
- $this->oSmarty->setTemplateDir($sTemplateDir);
- return $this->oSmarty->fetch($sTemplateFile, UNIQUE_ID);
+ $this->oSmarty->setTemplateDir($sTemplateDir);
+ return $this->oSmarty->fetch($sTemplateFile, UNIQUE_ID);
}
/**
View
8 vendor/candyCMS/core/controllers/Calendars.controller.php
@@ -70,10 +70,10 @@ protected function _showFormTemplate() {
# Create
else {
- $aData['content'] = isset($this->_aRequest['content']) ? $this->_aRequest['content'] : '';
- $aData['end_date'] = isset($this->_aRequest['end_date']) ? $this->_aRequest['end_date'] : '';
- $aData['start_date'] = isset($this->_aRequest['start_date']) ? $this->_aRequest['start_date'] : '';
- $aData['title'] = isset($this->_aRequest['title']) ? $this->_aRequest['title'] : '';
+ $aData['content'] = isset($this->_aRequest['content']) ? $this->_aRequest['content'] : '';
+ $aData['end_date'] = isset($this->_aRequest['end_date']) ? $this->_aRequest['end_date'] : '';
+ $aData['start_date'] = isset($this->_aRequest['start_date']) ? $this->_aRequest['start_date'] : '';
+ $aData['title'] = isset($this->_aRequest['title']) ? $this->_aRequest['title'] : '';
}
foreach ($aData as $sColumn => $sData)
Please sign in to comment.
Something went wrong with that request. Please try again.