[limb-svn] r7099 - 3.x/trunk/limb/core/src

[svn at limb-project.com]

Author: pachanga
Date: 2008-07-09 01:12:07 +0400 (Wed, 09 Jul 2008)
New Revision: 7099
URL: http://fisheye.limb-project.com/changelog/limb/?cs=7099

Modified:
   3.x/trunk/limb/core/src/lmbSet.class.php
Log:
-- removing duplication, lmbSet :: merge() == lmbSet :: import()

Modified: 3.x/trunk/limb/core/src/lmbSet.class.php
===================================================================
--- 3.x/trunk/limb/core/src/lmbSet.class.php	2008-07-08 21:10:04 UTC (rev 7098)
+++ 3.x/trunk/limb/core/src/lmbSet.class.php	2008-07-08 21:12:07 UTC (rev 7099)
@@ -72,15 +72,6 @@
     return $this->removeAll();
   }
 
-  function import($values)
-  {
-    if(!is_array($values))
-      return;
-
-    foreach($values as $name => $value)
-      $this->set($name, $value);
-  }
-
   function merge($values)
   {
     if(is_array($values) || ($values instanceof ArrayAccess))
@@ -90,6 +81,11 @@
     }
   }
 
+  function import($values)
+  {
+    $this->merge($values);
+  }
+
   function export()
   {
     $exported = array();