Tweaks

diff --git a/install.php b/install.php
index f23c39e4281bde7ebc6a67825ee77426950f47b0..42f2ac135c5e08245c131e73345db139370b603a 100644 (file)
--- a/install.php
+++ b/install.php
@@ -202,7 +202,7 @@ if ($INSTALL['stage'] == 3) {
 
     error_reporting(0);  // Hide errors 
     
-    if (!($dbconnected = $db->Connect($INSTALL['dbhost'],$INSTALL['dbuser'],$INSTALL['dbpass'],$INSTALL['dbname']))) {
+    if (! $dbconnected = $db->Connect($INSTALL['dbhost'],$INSTALL['dbuser'],$INSTALL['dbpass'],$INSTALL['dbname'])) {
         /// The following doesn't seem to work but we're working on it
         /// If you come up with a solution for creating a database in MySQL 
         /// feel free to put it in and let us know
@@ -595,7 +595,7 @@ function print_install_help($help) {
             print_string($help, 'install', phpversion());
             break;
         case 'memorylimithelp':
-            print_string($help, 'install', ini_get('memory_limit'));
+            print_string($help, 'install', get_memory_limit());
             break;
         default:
             print_string($help, 'install');

diff --git a/lang/en/install.php b/lang/en/install.php
index 2d9504c154e2d924f5b5e5e36ce42657b0e86b09..e29d4d80d54e2d005c4e80e9e5d1505c5a6df364 100755 (executable)
--- a/lang/en/install.php
+++ b/lang/en/install.php
@@ -10,7 +10,7 @@ $string['admindirsetting'] = "
     new name here.  For example: <br/>&nbsp;<br /><b>moodleadmin</b><br />&nbsp;<br />\r
     This will fix admin links in Moodle.";\r
 $string['chooselanguage'] = 'Choose a language';\r
-$string['compatibilitysettings'] = 'The following is a check on the compatibility of the server to run Moodle';\r
+$string['compatibilitysettings'] = 'Checking your PHP settings ...';\r
 $string['configfilenotwritten'] = "The installer script was not able to automatically create a config.php file containing your chosen settings. Please copy the following code into a file named config.php within the root directory of Moodle.";\r
 $string['configfilewritten'] = "config.php has been successfully created";\r
 $string['configurationcomplete'] = 'Configuration completed';\r
@@ -61,8 +61,8 @@ $string['gdversionerror'] = 'The GD library should be present to process and cre
 $string['gdversionhelp'] = 'The GD library should be present to process and create images';\r
 $string['installation'] = 'Installation';\r
 $string['memorylimit'] = 'Memory Limit';\r
-$string['memorylimiterror'] = 'The memory limit needs to be set to 16M or more or be changeable';\r
-$string['memorylimithelp'] = "The memory limit needs to be set to 16M or more or be changeable. Your current memory limit is set to \$a";\r
+$string['memorylimiterror'] = 'The PHP memory limit setting needs to be set to at least 16M, or be changeable';\r
+$string['memorylimithelp'] = "The memory limit needs to be set to at least 16M, or be changeable. Your current memory limit is set to \$a.<p>You can change your memory limit in your php.ini file, or sometimes by creating a .htaccess file in the Moodle directory containing this line:<p><ul>php_value memory_limit 16M</ul>";\r
 $string['pass'] = 'Pass';\r
 $string['PHPversion'] = 'PHP version';\r
 $string['PHPversionerror'] = 'PHP version must be at least 4.1.0';\r