Julio Montoya 12 years ago
parent
commit
859703f441
2 changed files with 36 additions and 25 deletions
  1. 3 3
      main/inc/lib/main_api.lib.php
  2. 33 22
      tests/phpunit/phpunit.xml

+ 3 - 3
main/inc/lib/main_api.lib.php

@@ -6495,8 +6495,8 @@ function api_set_settings_and_plugins() {
 
     // access_url == 1 is the default chamilo location
     $settings_by_access_list = array();
-
-    if ($_configuration['access_url'] != 1) {
+    $access_url_id = api_get_current_access_url_id();
+    if ($access_url_id != 1) {
         $url_info = api_get_access_url($_configuration['access_url']);
         if ($url_info['active'] == 1) {
             $settings_by_access = & api_get_settings(null, 'list', $_configuration['access_url'], 1);
@@ -6518,7 +6518,7 @@ function api_set_settings_and_plugins() {
     $result = api_get_settings(null, 'list', 1);
 
     foreach ($result as & $row) {
-        if ($_configuration['access_url'] != 1) {
+        if ($access_url_id != 1) {
             if ($url_info['active'] == 1) {
                 $var = empty($row['variable']) ? 0 : $row['variable'];
                 $subkey = empty($row['subkey']) ? 0 : $row['subkey'];

+ 33 - 22
tests/phpunit/phpunit.xml

@@ -1,24 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="autoload.php" backupGlobals="false"
-         backupStaticAttributes="false" strict="true" verbose="true">
-  <testsuites>
-    <testsuite name="Chamilo LMS classes">
-      <directory suffix="Test.class.php">../phpunit/classes</directory>
-      <directory suffix="Test.lib.php">../phpunit/classes</directory>
-    </testsuite>
-  </testsuites>
-  <logging>
-    <log type="coverage-clover" target="../logs/clover.xml"/>
-    <log type="coverage-html" target="../coverage" title="ChamiloTests"/>
-    <log type="junit" target="../logs/junit.xml" logIncompleteSkipped="false"/>
-  </logging>
-  <filter>
-    <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">../../main/inc</directory>
-      <exclude>
-        <!--file>autoload.inc.php</file-->
-        <!--file>global.inc.php</file-->
-      </exclude>
-    </whitelist>
-  </filter>
+<phpunit bootstrap="autoload.php"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         strict="true"
+         verbose="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+>
+    <testsuites>
+        <testsuite name="Chamilo LMS classes">
+            <directory suffix="Test.class.php">../phpunit/classes</directory>
+            <directory suffix="Test.lib.php">../phpunit/classes</directory>
+        </testsuite>
+    </testsuites>
+    <logging>
+        <log type="coverage-clover" target="../logs/clover.xml"/>
+        <log type="coverage-html" target="../coverage" title="ChamiloTests"/>
+        <log type="junit" target="../logs/junit.xml" logIncompleteSkipped="false"/>
+    </logging>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">../../main/inc</directory>
+            <exclude>
+                <!--file>autoload.inc.php</file-->
+                <!--file>global.inc.php</file-->
+            </exclude>
+        </whitelist>
+    </filter>
 </phpunit>