aboutsummaryrefslogtreecommitdiff
path: root/engine/start.php
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2011-12-31 20:14:45 +0100
committerSem <sembrestels@riseup.net>2011-12-31 20:14:45 +0100
commit9f4da6d87f2c520b975f968cedbcde4f3dce1a25 (patch)
treefee953cf498b6083faf56c61042d3bee07110331 /engine/start.php
parenta22660e997611fe2afb97689ea23774578ee80db (diff)
parente49df853b2cc3a6a9bc2dd527a64951050142eb9 (diff)
downloadelgg-9f4da6d87f2c520b975f968cedbcde4f3dce1a25.tar.gz
elgg-9f4da6d87f2c520b975f968cedbcde4f3dce1a25.tar.bz2
Merge git://github.com/Elgg/Elgg
Diffstat (limited to 'engine/start.php')
-rw-r--r--engine/start.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/start.php b/engine/start.php
index 00bdc3197..1decc5d80 100644
--- a/engine/start.php
+++ b/engine/start.php
@@ -92,7 +92,7 @@ $lib_files = array(
// these need to be loaded first.
'database.php', 'actions.php',
- 'admin.php', 'annotations.php', 'calendar.php',
+ 'admin.php', 'annotations.php',
'configuration.php', 'cron.php', 'entities.php', 'export.php',
'extender.php', 'filestore.php', 'group.php',
'location.php', 'mb_wrapper.php', 'memcache.php', 'metadata.php',
@@ -100,10 +100,10 @@ $lib_files = array(
'opendd.php', 'pagehandler.php', 'pam.php', 'plugins.php',
'private_settings.php', 'relationships.php', 'river.php', 'sites.php',
'statistics.php', 'tags.php', 'user_settings.php', 'users.php',
- 'upgrade.php', 'web_services.php', 'widgets.php', 'xml.php', 'xml-rpc.php',
+ 'upgrade.php', 'web_services.php', 'widgets.php', 'xml.php',
- //backwards compatibility
- 'deprecated-1.7.php', 'deprecated-1.8.php',
+ // backward compatibility
+ 'deprecated-1.7.php', 'deprecated-1.8.php', 'deprecated-1.9.php'
);
foreach ($lib_files as $file) {