Merge remote-tracking branch 'origin/master' into cint

LimeSurvey · Aug 29, 2016 · 4fdf9be · 4fdf9be
2 parents 3766825 + 54cb3a3
commit 4fdf9be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/application/controllers/admin/globalsettings.php b/application/controllers/admin/globalsettings.php
@@ -163,7 +163,7 @@ private function _saveSettings()
             {
                 setGlobalSetting('defaulttemplate', $sTemplate);
             }
-
+            setGlobalSetting('x_frame_options', Yii::app()->getRequest()->getPost('x_frame_options'));
         }
 
         // we set the admin theme
@@ -228,7 +228,6 @@ private function _saveSettings()
         setGlobalSetting('googleanalyticsapikey',$_POST['googleanalyticsapikey']);
         setGlobalSetting('googletranslateapikey',$_POST['googletranslateapikey']);
         setGlobalSetting('force_ssl', $_POST['force_ssl']);
-        setGlobalSetting('x_frame_options', $_POST['x_frame_options']);
         setGlobalSetting('surveyPreview_require_Auth', $_POST['surveyPreview_require_Auth']);
         setGlobalSetting('RPCInterface', $_POST['RPCInterface']);
         setGlobalSetting('rpc_publish_api', (bool) $_POST['rpc_publish_api']);

diff --git a/application/views/admin/global_settings/_security.php b/application/views/admin/global_settings/_security.php
@@ -49,7 +49,11 @@
 </div>
 
 <div class="form-group">
-    <label class="col-sm-5 control-label"  for="force_ssl"><?php eT('IFrame embedding allowed:'); ?></label>
+    <label class="col-sm-5 control-label"  for="force_ssl">
+    <?php if (Yii::app()->getConfig("demoMode")==true){ ?>
+    <span class="text-danger asterisk"></span>
+    <?php }; ?>
+     <?php eT('IFrame embedding allowed:'); echo ((Yii::app()->getConfig("demoMode")==true)?'*':'');?></label>
     <div class="col-sm-6">
         <?php $this->widget('yiiwheels.widgets.buttongroup.WhButtonGroup', array(
             'name' => 'x_frame_options',