aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-28 13:31:59 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-28 13:31:59 +0000
commit0f582ce2d8d17f1a4eabe0049511c9853d41d6d8 (patch)
tree6d6dac26d56d1c41cdefffe306360cbdce70cec0
parentde2486d54a16fb7c4385103a70f90f67519f683c (diff)
downloadelgg-0f582ce2d8d17f1a4eabe0049511c9853d41d6d8.tar.gz
elgg-0f582ce2d8d17f1a4eabe0049511c9853d41d6d8.tar.bz2
moved api.php to web_services.php as it is more descriptive
git-svn-id: http://code.elgg.org/elgg/trunk@7459 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/web_services.php (renamed from engine/lib/api.php)4
-rw-r--r--engine/start.php6
-rw-r--r--install/ElggInstaller.php5
3 files changed, 8 insertions, 7 deletions
diff --git a/engine/lib/api.php b/engine/lib/web_services.php
index 2c566b479..b9c87843e 100644
--- a/engine/lib/api.php
+++ b/engine/lib/web_services.php
@@ -1,7 +1,7 @@
<?php
/**
- * Elgg API
- * Functions and objects that make up the API engine.
+ * Elgg web services API
+ * Functions and objects for exposing custom web services.
*
* @package Elgg.Core
* @subpackage WebServicesAPI
diff --git a/engine/start.php b/engine/start.php
index 0ae24aaf5..7a3dee31e 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', 'api.php', 'calendar.php',
+ 'admin.php', 'annotations.php', 'calendar.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,14 +100,14 @@ $lib_files = array(
'opendd.php', 'pagehandler.php', 'pageowner.php', 'pam.php', 'plugins.php',
'private_settings.php', 'relationships.php', 'river.php', 'sites.php',
'statistics.php', 'tags.php', 'usersettings.php', 'users.php',
- 'version.php', 'widgets.php', 'xml.php', 'xml-rpc.php'
+ 'version.php', 'web_services.php', 'widgets.php', 'xml.php', 'xml-rpc.php'
);
foreach ($lib_files as $file) {
$file = $lib_dir . $file;
elgg_log("Loading $file...");
if (!include_once($file)) {
- $msg = sprint(elgg_echo('InstallationException:MissingLibrary'), $file);
+ $msg = sprintf(elgg_echo('InstallationException:MissingLibrary'), $file);
throw new InstallationException($msg);
}
}
diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index 060480791..e5bf47853 100644
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -732,7 +732,7 @@ class ElggInstaller {
// these want to be loaded first apparently?
'database.php', 'actions.php',
- 'admin.php', 'annotations.php', 'api.php',
+ 'admin.php', 'annotations.php',
'calendar.php', 'configuration.php', 'cron.php', 'entities.php',
'extender.php', 'filestore.php', 'group.php',
'location.php', 'mb_wrapper.php',
@@ -742,7 +742,8 @@ class ElggInstaller {
'pageowner.php', 'pam.php', 'plugins.php',
'private_settings.php', 'relationships.php', 'river.php',
'sites.php', 'statistics.php', 'tags.php', 'usersettings.php',
- 'users.php', 'version.php', 'widgets.php', 'xml.php', 'xml-rpc.php'
+ 'users.php', 'version.php', 'web_services.php',
+ 'widgets.php', 'xml.php', 'xml-rpc.php'
);
foreach ($lib_files as $file) {