diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php index b3bfa45332..52548e5ee8 100755 --- a/main/announcements/announcements.php +++ b/main/announcements/announcements.php @@ -53,11 +53,6 @@ $tbl_sessions = Database::get_main_table(TABLE_MAIN_SESSION); $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT); $tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY); -/* Libraries */ - -$lib = api_get_path(LIBRARY_PATH); //avoid useless function calls -require_once 'announcements.inc.php'; - $course_id = api_get_course_int_id(); $_course = api_get_course_info(); diff --git a/main/announcements/announcements.inc.php b/main/inc/lib/AnnouncementManager.php similarity index 100% rename from main/announcements/announcements.inc.php rename to main/inc/lib/AnnouncementManager.php diff --git a/main/social/profile.php b/main/social/profile.php index 0fc4ca9762..e2d2b1846a 100755 --- a/main/social/profile.php +++ b/main/social/profile.php @@ -108,7 +108,6 @@ $userIsOnline = user_is_online($user_id); $libpath = api_get_path(LIBRARY_PATH); require_once api_get_path(SYS_CODE_PATH).'calendar/myagenda.inc.php'; -require_once api_get_path(SYS_CODE_PATH).'announcements/announcements.inc.php'; require_once $libpath.'magpierss/rss_fetch.inc'; $ajax_url = api_get_path(WEB_AJAX_PATH).'message.ajax.php'; diff --git a/main/webservices/cm_webservice_announcements.php b/main/webservices/cm_webservice_announcements.php index da0299b3c5..036b8a505f 100755 --- a/main/webservices/cm_webservice_announcements.php +++ b/main/webservices/cm_webservice_announcements.php @@ -3,8 +3,6 @@ require_once(dirname(__FILE__).'/../inc/global.inc.php'); $libpath = api_get_path(LIBRARY_PATH); - -require_once(dirname(__FILE__).'/../announcements/announcements.inc.php'); require_once(dirname(__FILE__).'/cm_webservice.php'); /** diff --git a/tests/main/announcements/announcements.inc.test.php b/tests/main/announcements/announcements.inc.test.php index d7c008680b..9fcfea3f6d 100755 --- a/tests/main/announcements/announcements.inc.test.php +++ b/tests/main/announcements/announcements.inc.test.php @@ -1,10 +1,8 @@