Fix [Bug#28094] default_path_rules() breaks global $LOAD_PATH. By Tat…

…suki Sugiura.
mutoh · Jul 4, 2010 · 9ed5652 · 9ed5652
1 parent eac3e5a
commit 9ed5652
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/gettext/runtime/locale_path.rb b/lib/gettext/runtime/locale_path.rb
@@ -49,8 +49,8 @@ def default_path_rules
           }
         end
         default_path_rules += DEFAULT_RULES
-        
-        load_path = $LOAD_PATH
+
+        load_path = $LOAD_PATH.dup
         if defined? ::Gem
           load_path += Gem.all_load_paths
         end

diff --git a/test/test_locale_path.rb b/test/test_locale_path.rb
@@ -53,6 +53,7 @@ def test_env_GETTEXT_PATH
     path1 = File.join(topdir, "locale")
     path2 = File.join(topdir, "cgi", "locale")
 
+    GetText::LocalePath.memoize_clear
     ENV["GETTEXT_PATH"] = path1
     default_path_rules = GetText::LocalePath.default_path_rules
     assert(Regexp.compile(path1) =~ default_path_rules[0])
@@ -63,4 +64,11 @@ def test_env_GETTEXT_PATH
     assert(Regexp.compile(path1) =~ default_path_rules[0])
     assert(Regexp.compile(path2) =~ default_path_rules[1])
   end
+
+  def test_default_path_rules
+    GetText::LocalePath.memoize_clear
+    $LOAD_PATH.unshift("./lib")
+    default_path_rules = GetText::LocalePath.default_path_rules
+    assert_equal($LOAD_PATH[0], "./lib")
+  end
 end