Fix upgrade.

1.10.x
Julio Montoya 10 years ago
parent 96f98a4c60
commit b6ba2bf061
  1. 14
      main/inc/lib/chamilo_session.class.php
  2. 0
      src/Chamilo/CoreBundle/Component/HTMLPurifier/Filter/AllowIframes.php
  3. 19
      src/Chamilo/CoreBundle/Composer/ScriptHandler.php

@ -1,4 +1,5 @@
<?php
/**
* Chamilo session (i.e. the session that maintains the connection open after usr login)
*
@ -18,11 +19,13 @@
* @author Laurent Opprecht <laurent@opprecht.info> for the Univesity of Geneva
*/
/**
* @todo use session symfony component
* @todo replace all $_SESSION calls with this class.
* @todo remove System\Session class
* ChamiloSession class definition
*/
class ChamiloSession extends System\Session
{
const NAME = 'ch_sid';
/**
@ -48,15 +51,6 @@ class ChamiloSession extends System\Session
return $_configuration['session_lifetime'];
}
/**
* Returns whether the sessions are stored in the database (or not)
* @return bool True if session data are stored in the database, false if they're stored on disk
* @assert (null) === false
*/
static function session_stored_in_db()
{
return self::read('session_stored_in_db', false);
}
/**
* Starts the Chamilo session.

@ -46,15 +46,16 @@ class ScriptHandler
__DIR__.'/../../../../main/inc/lib/javascript/fullcalendar',
__DIR__.'/../../../../main/inc/lib/javascript/jquery-ui',
__DIR__.'/../../../../main/inc/lib/fckeditor',
//__DIR__.'/../../../../main/inc/lib/htmlpurifier/',
__DIR__.'/../../../../main/inc/lib/mpdf/',
__DIR__.'/../../../../main/inc/lib/symfony/',
__DIR__.'/../../../../main/inc/lib/system/media/renderer',
__DIR__.'/../../../../main/inc/lib/system/io',
__DIR__.'/../../../../main/inc/lib/system/net',
__DIR__.'/../../../../main/inc/lib/system/text/',
__DIR__.'/../../../../main/inc/lib/system/portfolio/',
__DIR__.'/../../../../main/inc/lib/tools/',
__DIR__.'/../../../../main/inc/lib/pchart/',
__DIR__.'/../../../../main/inc/lib/htmlpurifier',
__DIR__.'/../../../../main/announcements/resources',
];
@ -107,6 +108,22 @@ class ScriptHandler
__DIR__.'/../../../../main/inc/lib/page.class.php',
__DIR__.'/../../../../main/inc/lib/mail.lib.inc.php',
__DIR__.'/../../../../main/admin/system_management.php',
__DIR__.'/../../../../main/auth/external_login/facebook-php-sdk/src/base_facebook.php',
__DIR__.'/../../../../main/course_description/ajax_controller.class.php',
__DIR__.'/../../../../main/course_description/controller.class.php',
__DIR__.'/../../../../main/course_description/course_description.class.php',
__DIR__.'/../../../../main/course_description/course_description_form.class.php',
__DIR__.'/../../../../main/course_description/course_description_repository.class.php',
__DIR__.'/../../../../main/course_description/course_description_type.class.php',
__DIR__.'/../../../../main/course_description/course_description_type_repository.class.php',
__DIR__.'/../../../../main/course_description/course_import.class.php',
__DIR__.'/../../../../main/course_description/csv_reader.class.php',
__DIR__.'/../../../../main/course_description/csv_writer.class.php',
__DIR__.'/../../../../main/course_description/request.class.php',
__DIR__.'/../../../../main/course_description/upload_file_form.class.php',
__DIR__.'/../../../../main/auth/external_login/facebook-php-sdk/src/facebook.php',
__DIR__.'/../../../../main/auth/external_login/facebook-php-sdk/src/base_facebook.php',
];

Loading…
Cancel
Save