Merge branch 'master' into develop

LimeSurvey · Apr 13, 2018 · 5e4f292 · 5e4f292
2 parents 703b8db + 369da38
commit 5e4f292
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 1 deletion.
diff --git a/application/config/internal.php b/application/config/internal.php
@@ -148,6 +148,7 @@
                 'vardump' => array(
                     'class' => 'CWebLogRoute',
                     'categories' => 'vardump', // tracevar function
+                    'enabled' => isset($userConfig['config']['debug']) && $userConfig['config']['debug'] >= 1,
                 ),
                 'profile' => array(
                     'class' => 'CProfileLogRoute'

diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LimeSurvey language file\n"
 "Report-Msgid-Bugs-To: http://translate.limesurvey.org/\n"
-"POT-Creation-Date: 2018-04-11 14:47:50+00:00\n"
+"POT-Creation-Date: 2018-04-12 09:32:03+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4217,6 +4217,10 @@ msgstr ""
 msgid "You can't delete template '%s' because one or more templates inherit from it."
 msgstr ""
 
+#: application/controllers/admin/themes.php:573
+msgid "Theme '%s' does not exist."
+msgstr ""
+
 #: application/controllers/admin/themes.php:633
 msgid "Invalid theme name"
 msgstr ""

diff --git a/locale/ca/ca.mo b/locale/ca/ca.mo
diff --git a/locale/de-informal/de-informal.mo b/locale/de-informal/de-informal.mo
diff --git a/locale/de/de.mo b/locale/de/de.mo
diff --git a/locale/es-AR/es-AR.mo b/locale/es-AR/es-AR.mo
diff --git a/locale/nl-informal/nl-informal.mo b/locale/nl-informal/nl-informal.mo
diff --git a/locale/nl/nl.mo b/locale/nl/nl.mo
diff --git a/locale/pl/pl.mo b/locale/pl/pl.mo
diff --git a/tests/TestHelper.php b/tests/TestHelper.php
@@ -421,6 +421,10 @@ public function getWebDriver()
                 $profile->setPreference('browser.download.manager.showAlertInterval', 100);
                 $profile->setPreference('browser.download.manager.resumeOnWakeDelay', 0);
 
+                // This two lines are necessary to avoid issue https://github.com/SeleniumHQ/docker-selenium/issues/388.
+                $profile->setPreference('browser.tabs.remote.autostart', false);
+                $profile->setPreference('browser.tabs.remote.autostart.2', false);
+
                 $capabilities->setCapability(FirefoxDriver::PROFILE, $profile);
                 $webDriver = LimeSurveyWebDriver::create($host, $capabilities, 5000);
                 $success = true;

diff --git a/tests/controllers/ThemeControllerTest.php b/tests/controllers/ThemeControllerTest.php
@@ -104,10 +104,18 @@ public function testExtendTheme()
         $contr = new \themes(new \ls\tests\DummyController('dummyid'));
         $contr->delete('vanilla_version_1');
 
+        //foreach (App()->session['aFlashMessage'] as $flash) {
+            //var_dump($flash['message']);
+        //}
+
         // ...and the renamed theme.
         $contr = new \themes(new \ls\tests\DummyController('dummyid'));
         $contr->delete('vanilla_version_renamed');
 
+        //foreach (App()->session['aFlashMessage'] as $flash) {
+            //var_dump($flash['message']);
+        //}
+
         $urlMan = \Yii::app()->urlManager;
         $urlMan->setBaseUrl('http://' . self::$domain . '/index.php');
         $url = $urlMan->createUrl('admin/themeoptions');