summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2019-01-28 15:54:04 +0100
committerFlorian Pritz <bluewind@xinu.at>2019-01-28 15:54:04 +0100
commitb4841bc83374052c46fbc3f4a223484199546fd8 (patch)
tree385733a716c03b576335e5bb98361c13e92138f3 /application
parent98f7c65dddf0667f1a0462e08be9e6273ce658fb (diff)
parentc576995304fc3609cca0b7b92d1b2cd611ec82f5 (diff)
Merge tag '3.1.10' of git://github.com/bcit-ci/CodeIgniter into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application')
-rw-r--r--application/config/example/database.php2
-rw-r--r--application/config/user_agents.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/application/config/example/database.php b/application/config/example/database.php
index 5bfc5b293..a5083d0eb 100644
--- a/application/config/example/database.php
+++ b/application/config/example/database.php
@@ -47,7 +47,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
| 'ssl_ca' - Path to the certificate authority file
| 'ssl_capath' - Path to a directory containing trusted CA certificates in PEM format
| 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
-| 'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not ('mysqli' only)
+| 'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not
|
| ['compress'] Whether or not to use client compression (MySQL only)
| ['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index b6c85631e..ad0b0fd20 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -110,6 +110,7 @@ $mobiles = array(
// Phones and Manufacturers
'motorola' => 'Motorola',
'nokia' => 'Nokia',
+ 'nexus' => 'Nexus',
'palm' => 'Palm',
'iphone' => 'Apple iPhone',
'ipad' => 'iPad',