mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

* Add memory_limit output to s9y installation, 8MB for 32bit and

Browse Source 
16MB for 64bit OSes
This commit is contained in:
Garvin Hicking
2008-08-29 07:54:02 +00:00
parent e6701ee288
commit 5ef47ebf5d
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/NEWS
View File

@@ -3,6 +3,9 @@
Version 1.4 ()
------------------------------------------------------------------------
* Add memory_limit output to s9y installation, 8MB for 32bit and
16MB for 64bit OSes
* Add support for postgreSQL ts_vector fulltext search, thanks
to genesis.

12
include/admin/installer.inc.php
View File

@@ -343,6 +343,18 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
}
?></td>
</tr>
<tr>
<td>memory_limit</td>
<td width="150"><strong><?php echo (PHP_INT_SIZE == 4 ? '8M' : '16M'); ?></strong></td>
<td width="150"><?php
if ( serendipity_ini_bytesize(ini_get('memory_limit')) >= ((PHP_INT_SIZE == 4 ? 8 : 16)*1024*1024) ) {
echo serendipity_installerResultDiagnose(S9Y_I_SUCCESS, ini_get('memory_limit'));
} else {
echo serendipity_installerResultDiagnose(S9Y_I_WARNING, ini_get('memory_limit'));
}
?></td>
</tr>
</table>
<br />

1
serendipity_config.inc.php
View File

@@ -175,6 +175,7 @@ $serendipity['charsets'] = array(
*/
if ( !defined('IN_installer') && IS_installed === false ) {
header('Status: 302 Found');
header('X-RequireInstall: 1');
header('Location: ' . (strtolower($_SERVER['HTTPS']) == 'on' ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . str_replace('\\', '/', dirname($_SERVER['PHP_SELF'])) . '/serendipity_admin.php');
serendipity_die(sprintf(SERENDIPITY_NOT_INSTALLED, 'serendipity_admin.php'));
}