diff options
5 files changed, 51 insertions, 8 deletions
diff --git a/user_guide_src/source/installation/upgrade_154.rst b/user_guide_src/source/installation/upgrade_154.rst index 1bf3156ce..1d2c51d4a 100644 --- a/user_guide_src/source/installation/upgrade_154.rst +++ b/user_guide_src/source/installation/upgrade_154.rst @@ -28,7 +28,16 @@ Add the following to application/config/config.php :: - /* |-------------------------------------------------------------------------- | Default Character Set |-------------------------------------------------------------------------- | | This determines which character set is used by default in various methods | that require a character set to be provided. | */ $config['charset'] = "UTF-8"; + /* + |-------------------------------------------------------------------------- + | Default Character Set + |-------------------------------------------------------------------------- + | + | This determines which character set is used by default in various methods + | that require a character set to be provided. + | + */ + $config['charset'] = "UTF-8"; Step 3: Autoloading language files ================================== diff --git a/user_guide_src/source/installation/upgrade_160.rst b/user_guide_src/source/installation/upgrade_160.rst index daba2e5d2..e5d26611b 100644 --- a/user_guide_src/source/installation/upgrade_160.rst +++ b/user_guide_src/source/installation/upgrade_160.rst @@ -39,7 +39,17 @@ Add the following to application/config/autoload.php :: - /* | ------------------------------------------------------------------- | Auto-load Model files | ------------------------------------------------------------------- | Prototype: | | $autoload['model'] = array('my_model'); | */ $autoload['model'] = array(); + /* + | ------------------------------------------------------------------- + | Auto-load Model files + | ------------------------------------------------------------------- + | Prototype: + | + | $autoload['model'] = array('my_model'); + | + */ + + $autoload['model'] = array(); Step 4: Add to your database.php @@ -66,7 +76,8 @@ Add the following to your database configuration options :: - $db['default']['char_set'] = "utf8"; $db['default']['dbcollat'] = "utf8_general_ci"; + $db['default']['char_set'] = "utf8"; + $db['default']['dbcollat'] = "utf8_general_ci"; Step 5: Update your user guide diff --git a/user_guide_src/source/installation/upgrade_201.rst b/user_guide_src/source/installation/upgrade_201.rst index 4c6b3c3fa..93e1aa68d 100644 --- a/user_guide_src/source/installation/upgrade_201.rst +++ b/user_guide_src/source/installation/upgrade_201.rst @@ -34,5 +34,6 @@ need to be changed from:: to use either a / or base_url():: - echo form_open('/'); //<form action="http://example.com/index.php/" method="post" accept-charset="utf-8"> echo form_open(base_url()); //<form action="http://example.com/" method="post" accept-charset="utf-8"> + echo form_open('/'); //<form action="http://example.com/index.php/" method="post" accept-charset="utf-8"> + echo form_open(base_url()); //<form action="http://example.com/" method="post" accept-charset="utf-8"> diff --git a/user_guide_src/source/installation/upgrade_203.rst b/user_guide_src/source/installation/upgrade_203.rst index 481b4fda0..717aa3e50 100644 --- a/user_guide_src/source/installation/upgrade_203.rst +++ b/user_guide_src/source/installation/upgrade_203.rst @@ -58,5 +58,6 @@ Update Sessions Database Tables If you are using database sessions with the CI Session Library, please update your ci_sessions database table as follows:: - CREATE INDEX last_activity_idx ON ci_sessions(last_activity); ALTER TABLE ci_sessions MODIFY user_agent VARCHAR(120); + CREATE INDEX last_activity_idx ON ci_sessions(last_activity); + ALTER TABLE ci_sessions MODIFY user_agent VARCHAR(120); diff --git a/user_guide_src/source/installation/upgrade_b11.rst b/user_guide_src/source/installation/upgrade_b11.rst index 1d8efbe72..e70759be6 100644 --- a/user_guide_src/source/installation/upgrade_b11.rst +++ b/user_guide_src/source/installation/upgrade_b11.rst @@ -44,14 +44,35 @@ Step 5: Edit your config file The original application/config/config.php file has a typo in it Open the file and look for the items related to cookies:: - $conf['cookie_prefix'] = ""; $conf['cookie_domain'] = ""; $conf['cookie_path'] = "/"; + $conf['cookie_prefix'] = ""; + $conf['cookie_domain'] = ""; + $conf['cookie_path'] = "/"; Change the array name from $conf to $config, like this:: - $config['cookie_prefix'] = ""; $config['cookie_domain'] = ""; $config['cookie_path'] = "/"; + $config['cookie_prefix'] = ""; + $config['cookie_domain'] = ""; + $config['cookie_path'] = "/"; Lastly, add the following new item to the config file (and edit the option if needed):: - /* |------------------------------------------------ | URI PROTOCOL |------------------------------------------------ | | This item determines which server global | should be used to retrieve the URI string. The | default setting of "auto" works for most servers. | If your links do not seem to work, try one of | the other delicious flavors: | | 'auto' Default - auto detects | 'path_info' Uses the PATH_INFO | 'query_string' Uses the QUERY_STRING */ $config['uri_protocol'] = "auto"; + + /* + |------------------------------------------------ + | URI PROTOCOL + |------------------------------------------------ + | + | This item determines which server global + | should be used to retrieve the URI string. The + | default setting of "auto" works for most servers. + | If your links do not seem to work, try one of + | the other delicious flavors: + | + | 'auto' Default - auto detects + | 'path_info' Uses the PATH_INFO + | 'query_string' Uses the QUERY_STRING + */ + + $config['uri_protocol'] = "auto"; |