diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2013-02-14 14:28:46 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2013-02-14 14:28:46 +0000 |
| commit | 711651f727e093cc7357a6bbff6bd992fd6dfd80 (patch) | |
| tree | 2dadc1c06acf1ab3d42d3ed5415568535db54416 /system | |
| parent | 0047af90bf4db08b22838e6ded22a7fa70cee98a (diff) | |
| parent | e5ed05004f005bdccdbf68e199ae2324ad97e895 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'system')
| -rw-r--r-- | system/helpers/url.php | 2 | ||||
| -rw-r--r-- | system/libraries/ORM.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/helpers/url.php b/system/helpers/url.php index 1bc81230..014f96fe 100644 --- a/system/helpers/url.php +++ b/system/helpers/url.php @@ -62,7 +62,7 @@ class url_Core { if ($site_domain === '' OR $site_domain[0] === '/') { // Guess the server name if the domain starts with slash - $base_url = $protocol.'://'.$_SERVER['HTTP_HOST'].$site_domain; + $base_url = $protocol.'://'.($_SERVER['SERVER_NAME']?$_SERVER['SERVER_NAME']:$_SERVER['HTTP_HOST']).$site_domain; } else { diff --git a/system/libraries/ORM.php b/system/libraries/ORM.php index eb34221c..16e047bc 100644 --- a/system/libraries/ORM.php +++ b/system/libraries/ORM.php @@ -1469,6 +1469,7 @@ class ORM_Core { // Load the result $result = $this->db_builder->execute($this->db); + $this->db_applied = array(); if ($array === TRUE) { |