mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 22:28:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.2-dev' of https://github.com/humhub/humhub into v1.2-dev

Browse Source
This commit is contained in:
buddh4 2017-02-04 13:48:52 +01:00
commit e66d2ebbaa
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protected/humhub/components/Theme.php
View File

@ -238,7 +238,7 @@ class Theme extends \yii\base\Theme
public function parseThemeVariables($lessFileName)
{
// Parse default values
$variables = $this->parseLessVariables(Yii::getAlias('@web-static/less/'.$lessFileName));
$variables = $this->parseLessVariables(Yii::getAlias('@webroot-static/less/'.$lessFileName));
// Overwrite theme values
return \yii\helpers\ArrayHelper::merge($variables, $this->parseLessVariables($this->getBasePath() . '/less/'.$lessFileName));

7
protected/humhub/modules/stream/actions/Stream.php
View File

@ -278,6 +278,13 @@ abstract class Stream extends Action
if ($underlyingObject === null) {
throw new Exception('Could not get contents underlying object!');
}
// Fix for newly created content
if ($content->created_at instanceof \yii\db\Expression) {
$content->created_at = date('Y-m-d G:i:s');
$content->updated_at = $content->created_at;
}
$underlyingObject->populateRelation('content', $content);
$result['output'] = Yii::$app->controller->renderAjax('@humhub/modules/content/views/layouts/wallEntry', [
'entry' => $content,