diff --git a/common/models/Settings.php b/common/models/Settings.php index b2512c4..c3a0116 100755 --- a/common/models/Settings.php +++ b/common/models/Settings.php @@ -199,7 +199,7 @@ public static function getInstance() { if (empty( self::$instance )) { - self::$instance = self::find()->with('languages')->where([ 'id' => 1 ])->one(); + self::$instance = self::find()->with('language')->where([ 'id' => 1 ])->one(); return self::$instance; } diff --git a/frontend/views/site/contact.php b/frontend/views/site/contact.php index 21124a6..35ce9de 100755 --- a/frontend/views/site/contact.php +++ b/frontend/views/site/contact.php @@ -58,8 +58,8 @@ JS;
language->address )) { - echo $settings->language->address; + if (!empty( $settings->address )) { + echo $settings->address; } ?>
-- libgit2 0.21.4