diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-02-23 11:11:11 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-02-23 11:11:11 -0800 |
| commit | 16bf1d18adc870d07cd83e40bc9fe5dbe5400fad (patch) | |
| tree | 7d03a767f6d76554296847238ba94c526067ea79 /modules/gallery | |
| parent | fb5503be09047def6efd24a74188ad55af7a80f2 (diff) | |
| parent | 6afc5ccf5c5d70b3aef4024f892141a07779c25f (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/libraries/Gallery_I18n.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gallery/libraries/Gallery_I18n.php b/modules/gallery/libraries/Gallery_I18n.php index 0e9c0bdc..f1e77744 100644 --- a/modules/gallery/libraries/Gallery_I18n.php +++ b/modules/gallery/libraries/Gallery_I18n.php @@ -166,7 +166,8 @@ class Gallery_I18n_Core { $cache_key = "translation|" . $locale; $cache = Cache::instance(); $translations = $cache->get($cache_key); - if (empty($translations)) { + if (!isset($translations) || !is_array($translations)) { + $translations = array(); foreach (db::build() ->select("key", "translation") ->from("incoming_translations") |