diff options
| author | Sem <sembrestels@riseup.net> | 2011-12-31 20:14:45 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2011-12-31 20:14:45 +0100 |
| commit | 9f4da6d87f2c520b975f968cedbcde4f3dce1a25 (patch) | |
| tree | fee953cf498b6083faf56c61042d3bee07110331 /install | |
| parent | a22660e997611fe2afb97689ea23774578ee80db (diff) | |
| parent | e49df853b2cc3a6a9bc2dd527a64951050142eb9 (diff) | |
| download | elgg-9f4da6d87f2c520b975f968cedbcde4f3dce1a25.tar.gz elgg-9f4da6d87f2c520b975f968cedbcde4f3dce1a25.tar.bz2 | |
Merge git://github.com/Elgg/Elgg
Diffstat (limited to 'install')
| -rw-r--r-- | install/ElggInstaller.php | 6 | ||||
| -rw-r--r-- | install/languages/en.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php index d556ba744..2070f15e9 100644 --- a/install/ElggInstaller.php +++ b/install/ElggInstaller.php @@ -780,7 +780,7 @@ class ElggInstaller { 'database.php', 'actions.php', 'admin.php', 'annotations.php', - 'calendar.php', 'cron.php', 'entities.php', + 'cron.php', 'entities.php', 'extender.php', 'filestore.php', 'group.php', 'location.php', 'mb_wrapper.php', 'memcache.php', 'metadata.php', 'metastrings.php', @@ -790,8 +790,8 @@ class ElggInstaller { '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', 'deprecated-1.7.php', - 'deprecated-1.8.php', + 'widgets.php', 'xml.php', 'deprecated-1.7.php', + 'deprecated-1.8.php', 'deprecated-1.9.php' ); foreach ($lib_files as $file) { diff --git a/install/languages/en.php b/install/languages/en.php index 3e2569669..bbcd72d20 100644 --- a/install/languages/en.php +++ b/install/languages/en.php @@ -64,7 +64,7 @@ If you are ready to proceed, click the Next button.", 'install:database:label:dbhost' => 'Database Host', 'install:database:label:dbprefix' => 'Database Table Prefix', - 'install:database:help:dbuser' => 'User that has full priviledges to the MySQL database that you created for Elgg', + 'install:database:help:dbuser' => 'User that has full privileges to the MySQL database that you created for Elgg', 'install:database:help:dbpassword' => 'Password for the above database user account', 'install:database:help:dbname' => 'Name of the Elgg database', 'install:database:help:dbhost' => 'Hostname of the MySQL server (usually localhost)', |