Pārlūkot izejas kodu

Merge branch '1.11.x' of https://github.com/chamilo/chamilo-lms into 1.11.x

Nicolas Ducoulombier 7 gadi atpakaļ
vecāks
revīzija
1643e27fc7

+ 1 - 0
app/config/events.conf.dist.php

@@ -3,6 +3,7 @@
 
 /**
  * Events' configuration
+ * @deprecated to be removed in 2.x
  * Used to configure each event and to link them to functions the event'll fire.
  * The flow is like the following :
  * 1. somewhere in the application an event is fired

+ 6 - 7
bin/doctrine.php

@@ -1,6 +1,10 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use Doctrine\ORM\Tools\Console\ConsoleRunner;
+use Symfony\Component\Console\Helper\HelperSet;
+use Doctrine\DBAL\Types\Type;
+
 /**
  * Very useful script in order to create a Migration file based in the
  * current differences of the database:
@@ -15,11 +19,6 @@
  *
  **/
 
-
-use Doctrine\ORM\Tools\Console\ConsoleRunner;
-use Symfony\Component\Console\Helper\HelperSet;
-use Doctrine\DBAL\Types\Type;
-
 (@include_once __DIR__.'/../vendor/autoload.php') || @include_once __DIR__.'/../../../autoload.php';
 
 $directories = array(getcwd(), getcwd().DIRECTORY_SEPARATOR.'config');
@@ -48,10 +47,10 @@ Type::overrideType(
     Database::getUTCDateTimeTypeClass()
 );
 
-Type::addType(
+/*Type::addType(
     'json',
     'Sonata\Doctrine\Types\JsonType'
-);
+);*/
 
 $commands = array(
     new \Doctrine\DBAL\Migrations\Tools\Console\Command\DiffCommand(),

+ 1 - 0
main/inc/lib/events_dispatcher.class.php

@@ -3,6 +3,7 @@
 /**
  *  Class EventsDispatcher
  * Entry point for every event in the application.
+ * @deprecated to be removed in 2.x
  * Fires the functions linked to the events according to the event's conf.
  * Every function got its own filter, it's fired inside the functiones fired
  * by this class. The filter config is next to the event config, in conf/events.conf.php

+ 1 - 0
main/inc/lib/events_email.class.php

@@ -3,6 +3,7 @@
 
 /**
  * Class EventsMail
+ * @deprecated to be removed in 2.x
  * manages the e-mail sending action when a event requires it
  */
 class EventsMail