From c6e1d6af3f2a2709728d3cd6e68075fe88e20d06 Mon Sep 17 00:00:00 2001 From: skodak Date: Mon, 30 Mar 2009 17:09:39 +0000 Subject: [PATCH] MDL-18540 fixing "extra" memory strings --- admin/settings/server.php | 4 ++-- lang/en_utf8/admin.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/settings/server.php b/admin/settings/server.php index c21dda541f..da5d81fbf0 100644 --- a/admin/settings/server.php +++ b/admin/settings/server.php @@ -234,8 +234,8 @@ $ADMIN->add('server', new admin_externalpage('phpinfo', get_string('phpinfo'), " // "performance" settingpage $temp = new admin_settingpage('performance', get_string('performance', 'admin')); -$temp->add(new admin_setting_configselect('extramemorylimit', get_string('memorylimit', 'admin'), - get_string('configmemorylimit', 'admin'), '128M', +$temp->add(new admin_setting_configselect('extramemorylimit', get_string('extramemorylimit', 'admin'), + get_string('configextramemorylimit', 'admin'), '128M', // if this option is set to 0, default 128M will be used array( '64M' => '64M', '128M' => '128M', diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php index 65e60cb55b..03e41452e6 100644 --- a/lang/en_utf8/admin.php +++ b/lang/en_utf8/admin.php @@ -136,6 +136,7 @@ $string['configenrolmentplugins'] = 'Please choose the enrolment plugins you wis $string['configerrorlevel'] = 'Choose the amount of PHP warnings that you want to be displayed. Normal is usually the best choice.'; $string['configexperimentalsplitrestore'] = 'If enabled, course backup files will be checked for XML errors and split into smaller parts for use in the restore process. This will result in improvements to restore robustness and execution times, particularly for medium to large course backups.'; $string['configextendedusernamechars'] = 'Enable this setting to allow students to use any characters in their usernames (note this does not affect their actual names). The default is \"false\" which restricts usernames to be alphanumeric characters only'; +$string['configextramemorylimit'] = 'Some scripts like search, backup/restore or cron require more memory. Set higher values for large sites.'; $string['configextrauserselectorfields'] = 'When selecting users, for example when assigning roles or when adding users to a group, these fields will shown in addition to full names, and will be included in any searches. For security reasons, displaying usernames is not recommended.'; $string['configfilterall'] = 'Filter all strings, including headings, titles, navigation bar and so on. This is mostly useful when using the multilang filter, otherwise it will just create extra load on your site for little gain.'; $string['configfiltermatchoneperpage'] = 'Automatic linking filters will only generate a single link for the first matching text instance found on the complete page. All others are ignored.'; @@ -184,7 +185,6 @@ $string['configmaxeditingtime'] = 'This specifies the amount of time people have $string['configmaxevents'] = 'Events to Lookahead'; $string['configmemcachedhosts'] = 'For memcached. Comma-separated list of hosts that are running the memcached daemon. Use IP addresses to avoid DNS latency. memcached does not behave well if you add/remove hosts on a running setup.'; $string['configmemcachedpconn'] = 'For memcached. Use persistent connections. Use carefully -- it can make Apache/PHP crash after a restart of the memcached daemon.'; -$string['configmemorylimit'] = 'This sets the maximum amount of memory that a script is allowed to allocate. This option is applied to search indexing, backup/restore and admin/health scripts.'; $string['configmessaging'] = 'Should the messaging system between site users be enabled?'; $string['configminpassworddigits'] = 'Passwords must have at least these many digits.'; $string['configminpasswordlength'] = 'Passwords must be at least these many characters long.'; @@ -405,6 +405,7 @@ $string['experimental'] = 'Experimental'; $string['experimentalsettings'] = 'Experimental settings'; $string['experimentalsplitrestore'] = 'Experimental split restore'; $string['extendedusernamechars'] = 'Allow extended characters in usernames'; +$string['extramemorylimit'] = 'Extra PHP memory limit'; $string['extrauserselectorfields'] = 'When selecting users, search and display'; $string['fatalsessionautostart'] = '

Serious configuration error detected, please notify server administrator.

To operate properly, Moodle requires that administrator changes PHP settings.

session.auto_start must be set to off.

This setting is controlled by editing php.ini, Apache/IIS
configuration or .htaccess file on the server.

'; $string['fatalmagicquotesruntime'] = '

Serious configuration error detected, please notify server administrator.

To operate properly, Moodle requires that administrator changes PHP settings.

magic_quotes_runtime must be set to off.

This setting is controlled by editing php.ini, Apache/IIS
configuration or .htaccess file on the server.

'; @@ -551,7 +552,6 @@ $string['mediapluginswfnote'] = 'As a default security measure, normal users sho $string['mediapluginwmv'] = 'Enable .wmv filter'; $string['memcachedhosts'] = 'memcached hosts'; $string['memcachedpconn'] = 'memcached use persistent connections'; -$string['memorylimit'] = 'PHP memory limit'; $string['messaging'] = 'Enable messaging system'; $string['minpasswordlength'] = 'Password Length'; $string['minpassworddigits'] = 'Digits'; -- 2.39.5