Merge pull request #1205 from Byloth/master

[FIX] Solved a SQL syntax problem while using the latest MariaDB version.

application/models/User_model.php

@@ -362,7 +362,7 @@ class User_Model extends CI_Model {
 	// FUNCTION: array timezones()
 	// Returns a list of timezones
 	function timezones() {
-		$r = $this->db->query('SELECT id, name FROM timezones ORDER BY offset');
+		$r = $this->db->query('SELECT id, name FROM timezones ORDER BY `offset`');
 		$ts = array();
 		foreach ($r->result_array() as $t) {
 			$ts[$t['id']] = $t['name'];