summaryrefslogtreecommitdiffstats
path: root/user_guide/installation
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-01-30 21:26:25 +0100
committerDerek Jones <derek.jones@ellislab.com>2008-01-30 21:26:25 +0100
commit75d568db823b8fe7526e416f5e3f1c2c235f5473 (patch)
treeb2e37d724cbdc56c345a2e7306539870c5c76c88 /user_guide/installation
parentf653a2fe2f82130ff9d8db6a4913b4823dd81424 (diff)
removed 'active_r' db config variable, replaced with global $active_record setting. (bug report #1834)
Diffstat (limited to 'user_guide/installation')
-rw-r--r--user_guide/installation/upgrade_160.html7
1 files changed, 6 insertions, 1 deletions
diff --git a/user_guide/installation/upgrade_160.html b/user_guide/installation/upgrade_160.html
index 9cddf6b61..4b513d506 100644
--- a/user_guide/installation/upgrade_160.html
+++ b/user_guide/installation/upgrade_160.html
@@ -82,7 +82,12 @@ Upgrading from 1.5.3 to 1.5.4
<p><code>$config['sess_time_to_update'] = 300;</code></p>
<h2>Step 3: Add to your database.php </h2>
-<p>Add the following to system/application/config/database.php with the other database configuration options</p>
+<p>Make the following changes to your system/application/config/database.php file:</p>
+<p>Add the following variable above the database configuration options, with <dfn>$active_group</dfn></p>
+<p><code>$active_record = TRUE;</code></p>
+<p>Remove the following from your database configuration options</p>
+<p><code>$db['default']['active_r'] = TRUE;</code></p>
+<p>Add the following to your database configuration options</p>
<p><code>$db['default']['char_set'] = &quot;utf8&quot;;<br />
$db['default']['dbcollat'] = &quot;utf8_general_ci&quot;;</code></p>