diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php index e92945411a..c1ce551c7a 100755 --- a/main/inc/global.inc.php +++ b/main/inc/global.inc.php @@ -595,4 +595,3 @@ if (empty($default_quota)) { define('DEFAULT_DOCUMENT_QUOTA', $default_quota); // Forcing PclZip library to use a custom temporary folder. define('PCLZIP_TEMPORARY_DIR', api_get_path(SYS_ARCHIVE_PATH)); - diff --git a/src/Chamilo/CoreBundle/Entity/Session.php b/src/Chamilo/CoreBundle/Entity/Session.php index b1d255204f..e8788794bc 100644 --- a/src/Chamilo/CoreBundle/Entity/Session.php +++ b/src/Chamilo/CoreBundle/Entity/Session.php @@ -869,7 +869,6 @@ class Session $now = new \Datetime('now'); if ($now > $this->getAccessStartDate()) { - return true; } diff --git a/src/Chamilo/CourseBundle/Component/CourseCopy/CourseBuilder.php b/src/Chamilo/CourseBundle/Component/CourseCopy/CourseBuilder.php index f2bcef5a56..87c0d11a27 100644 --- a/src/Chamilo/CourseBundle/Component/CourseCopy/CourseBuilder.php +++ b/src/Chamilo/CourseBundle/Component/CourseCopy/CourseBuilder.php @@ -708,7 +708,8 @@ class CourseBuilder // 2nd union gets the orphan questions from question that were deleted in a exercise. $sql = " ( - SELECT question_id, q.* FROM $table_que q INNER JOIN $table_rel r + SELECT question_id, q.* FROM $table_que q + INNER JOIN $table_rel r ON (q.c_id = r.c_id AND q.id = r.question_id) INNER JOIN $table_qui ex ON (ex.id = r.exercice_id AND ex.c_id = r.c_id ) @@ -716,8 +717,8 @@ class CourseBuilder ) UNION ( - SELECT question_id, q.* FROM $table_que q left - OUTER JOIN $table_rel r + SELECT question_id, q.* FROM $table_que q + left OUTER JOIN $table_rel r ON (q.c_id = r.c_id AND q.id = r.question_id) WHERE q.c_id = $courseId AND r.question_id is null )