Skip to content

Commit

Permalink
Raise our required version to 4.0.6, mainly to make sure DIRECTORY_SE…
Browse files Browse the repository at this point in the history
…PARATOR

is available but also to make way for using the variable ordered parameters
feature of sprintf() in the internationalization code.

4.0.6 is two years old now so it should be a more than reasonable requirement.

* core.php: remove DIRECTORY_SEPARATOR definition

* core/php_api.php: raise required version to 4.0.6

* core/compress_api.php
  (compress_is_enabled): remove check for PHP greater than 4.0.4 - we now
    require 4.0.6 anyway

* doc/INSTALL:
* doc/README:
* doc/configuration.html:
  update version number in documentation


git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@1839 f5dc347c-c33d-0410-90a0-b07cc1902cb9
  • Loading branch information
Julian Fitzell committed Feb 15, 2003
1 parent 5cad7a7 commit 33c5c68
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 21 deletions.
13 changes: 2 additions & 11 deletions core.php
Expand Up @@ -6,7 +6,7 @@
# See the README and LICENSE files for details

# --------------------------------------------------------
# $Id: core.php,v 1.18 2003-02-14 19:06:54 jfitzell Exp $
# $Id: core.php,v 1.19 2003-02-15 01:25:48 jfitzell Exp $
# --------------------------------------------------------

###########################################################################
Expand All @@ -17,17 +17,8 @@
# headers from being sent if there's a blank line in an included file
ob_start();

# Directory separator was introduced in PHP 4.0.6
if ( !defined( 'DIRECTORY_SEPARATOR' ) ) {
if (substr(php_uname(), 0, 7) == 'Windows') {
define('DIRECTORY_SEPARATOR', '\\');
} else {
define('DIRECTORY_SEPARATOR', '/');
}
}

# Include compatibility file before anything else
require_once( dirname( __FILE__ ).DIRECTORY_SEPARATOR.'core'.DIRECTORY_SEPARATOR.'php_api.php' );
require_once( dirname( __FILE__ ).DIRECTORY_SEPARATOR.'core'.DIRECTORY_SEPARATOR.'php_api.php' );

# Load constants and configuration files
require_once( dirname( __FILE__ ).DIRECTORY_SEPARATOR.'core'.DIRECTORY_SEPARATOR.'constant_inc.php' );
Expand Down
10 changes: 5 additions & 5 deletions core/compress_api.php
Expand Up @@ -6,21 +6,21 @@
# See the README and LICENSE files for details

# --------------------------------------------------------
# $Id: compress_api.php,v 1.5 2003-01-03 03:24:24 jfitzell Exp $
# $Id: compress_api.php,v 1.6 2003-02-15 01:25:49 jfitzell Exp $
# --------------------------------------------------------

###########################################################################
# Compression API
#
# Starts the buffering/compression (only if the compression option is ON
# and PHP version 4.0.4 or above is used). This method should be called
# after all possible re-directs and access level checks.
# Starts the buffering/compression (only if the compression option is ON)
# This method should be called after all possible re-directs and
# access level checks.
###########################################################################

# ----------------
# Check if compression should be enabled.
function compress_is_enabled() {
return ( ( ON == config_get( 'compress_html' ) ) && php_version_at_least('4.0.4') );
return ( ON == config_get( 'compress_html' ) );
}
# ----------------
# Start output buffering with compression.
Expand Down
4 changes: 2 additions & 2 deletions core/php_api.php
Expand Up @@ -6,7 +6,7 @@
# See the README and LICENSE files for details

# --------------------------------------------------------
# $Id: php_api.php,v 1.7 2003-01-25 21:29:20 jlatour Exp $
# $Id: php_api.php,v 1.8 2003-02-15 01:25:49 jfitzell Exp $
# --------------------------------------------------------

###########################################################################
Expand All @@ -16,7 +16,7 @@
###########################################################################

# Constant for our minimum required PHP version
define( 'PHP_MIN_VERSION', '4.0.4' );
define( 'PHP_MIN_VERSION', '4.0.6' );

# --------------------
# Returns true if the current PHP version is higher than the one
Expand Down
2 changes: 1 addition & 1 deletion doc/INSTALL
Expand Up @@ -18,7 +18,7 @@ document. Use a browser and open doc/installation.html.
# --- Requirements ----------

* MySQL 3.23.2 and higher
* PHP 4.0.4 and higher
* PHP 4.0.6 and higher
* a webserver

# --- Summary ---------------
Expand Down
2 changes: 1 addition & 1 deletion doc/README
Expand Up @@ -54,7 +54,7 @@ Security exists though I'm not really in a position to judge how secure. So,
if you're going to use this try to use it in a semi-private area until this
package has been looked through a few times.

You will need to have php 4.0.4 or higher, mysql 3.23.2 and higher, and a webserver. You don't
You will need to have php 4.0.6 or higher, mysql 3.23.2 and higher, and a webserver. You don't
need to know too much about any of them other than how to set them up and some
basic administraton commands.

Expand Down
2 changes: 1 addition & 1 deletion doc/configuration.html
Expand Up @@ -439,7 +439,7 @@ <h2>Content</h2>
<p>
Users can also signup for their own accounts. Emails must be valid!
<p>
You may now use the phpMailer script to send out emails. It is recommended if you currently use Windows and PHP 4.0.4 or higher.
You may now use the phpMailer script to send out emails. It is recommended if you currently use Windows.
</td>
</tr>
</table>
Expand Down

0 comments on commit 33c5c68

Please sign in to comment.