diff options
| author | Mohammad Javad Naderi <mjnaderi@gmail.com> | 2013-09-10 12:33:21 +0200 |
|---|---|---|
| committer | Mohammad Javad Naderi <mjnaderi@gmail.com> | 2013-09-10 12:33:21 +0200 |
| commit | 2c30bd72b46cfdd36878273c5a8d843c7e056d42 (patch) | |
| tree | dd7cdc475943b9ff0ee6de212319231915409b03 /system | |
| parent | c6f5ed16c6a4a146deb40870781442d0936ac33a (diff) | |
| parent | b61affdfeb37da0e97fc33a8ffe3ccabb0e47e04 (diff) | |
Merge remote-tracking branch 'asli/develop' into patch-1
Diffstat (limited to 'system')
| -rw-r--r-- | system/database/DB_query_builder.php | 4 | ||||
| -rw-r--r-- | system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/postgre/postgre_driver.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index e6a108209..a36501eb6 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -1138,7 +1138,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { * ORDER BY * * @param string $orderby - * @param string $direction ASC or DESC + * @param string $direction ASC, DESC or RANDOM * @param bool $escape * @return CI_DB_query_builder */ @@ -1152,7 +1152,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { // Do we have a seed value? $orderby = ctype_digit((string) $orderby) - ? $orderby = sprintf($this->_random_keyword[1], $orderby) + ? sprintf($this->_random_keyword[1], $orderby) : $this->_random_keyword[0]; } elseif (empty($orderby)) diff --git a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php index d0cdde2e2..83daee9f6 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php +++ b/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php @@ -166,7 +166,7 @@ class CI_DB_pdo_pgsql_driver extends CI_DB_pdo_driver { * ORDER BY * * @param string $orderby - * @param string $direction ASC or DESC + * @param string $direction ASC, DESC or RANDOM * @param bool $escape * @return object */ diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index ac7345ad6..f24db46b4 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -512,7 +512,7 @@ class CI_DB_postgre_driver extends CI_DB { * ORDER BY * * @param string $orderby - * @param string $direction ASC or DESC + * @param string $direction ASC, DESC or RANDOM * @param bool $escape * @return object */ |