]>
Commit | Line | Data |
---|---|---|
68aea432 ER |
1 | diff -Naru a/setup/config.inc.php b/setup/config.inc.php |
2 | --- a/setup/config.inc.php 2005-06-13 02:18:33 -07:00 | |
3 | +++ b/setup/config.inc.php 2005-06-13 02:18:33 -07:00 | |
4 | @@ -119,7 +119,7 @@ | |
5 | @define("APP_SYSTEM_USER_ID", 1); | |
6 | ||
7 | // if full text searching is enabled | |
8 | -@define("APP_ENABLE_FULLTEXT", false); | |
9 | +@define("APP_ENABLE_FULLTEXT", %{APP_ENABLE_FULLTEXT}%); | |
10 | ||
11 | @define("APP_BENCHMARK", false); | |
12 | if (APP_BENCHMARK) { | |
13 | diff -Naru a/setup/index.php b/setup/index.php | |
14 | --- a/setup/index.php 2005-06-13 02:18:33 -07:00 | |
15 | +++ b/setup/index.php 2005-06-13 02:18:33 -07:00 | |
16 | @@ -398,6 +398,17 @@ | |
17 | $protocol_type = 'http://'; | |
18 | } | |
19 | $config_contents = str_replace("%{PROTOCOL_TYPE}%", $protocol_type, $config_contents); | |
20 | + // disable the full-text search feature for certain mysql server users | |
21 | + $stmt = "SELECT VERSION();"; | |
22 | + $res = mysql_query($stmt, $conn); | |
23 | + $mysql_version = mysql_result($res, 0, 0); | |
24 | + preg_match('/(\d{1,2}\.\d{1,2}\.\d{1,2})/', $mysql_version, $matches); | |
25 | + if ($mysql_version > '4.0.23') { | |
26 | + $config_contents = str_replace("%{APP_ENABLE_FULLTEXT}%", "true", $config_contents); | |
27 | + } else { | |
28 | + $config_contents = str_replace("%{APP_ENABLE_FULLTEXT}%", "false", $config_contents); | |
29 | + } | |
30 | + | |
31 | $fp = @fopen('../config.inc.php', 'w'); | |
32 | if ($fp === FALSE) { | |
33 | return "Could not open the file 'config.inc.php' for writing. The permissions on the file should be set as to allow the user that the web server runs as to open it. Please correct this problem and try again."; | |
34 | # This is a BitKeeper generated diff -Nru style patch. | |
35 | # | |
36 | # ChangeSet | |
37 | # 2005/06/07 12:29:11-05:00 jpm@mysql.com | |
38 | # Added a feature to automatically enable/disable the full-text search feature on the installation procedure | |
39 | # | |
40 | # ChangeLog | |
41 | # 2005/06/07 12:29:10-05:00 jpm@mysql.com +1 -0 | |
42 | # Added a feature to automatically enable/disable the full-text search feature on the installation procedure | |
43 | # | |
44 | # setup/config.inc.php | |
45 | # 2005/06/07 12:29:11-05:00 jpm@mysql.com +1 -1 | |
46 | # Added a feature to automatically enable/disable the full-text search feature on the installation procedure | |
47 | # | |
48 | # setup/index.php | |
49 | # 2005/06/07 12:29:11-05:00 jpm@mysql.com +11 -0 | |
50 | # Added a feature to automatically enable/disable the full-text search feature on the installation procedure | |
51 | # |