merge from yiisoft/yii2

2026-03-20 06:08:08 +01:00 · 2018-11-14 11:57:32 +08:00
parent 47df8a8cc0
commit 489dd119a5
426 changed files with 18465 additions and 4215 deletions
--- a/framework/data/ActiveDataProvider.php
+++ b/framework/data/ActiveDataProvider.php
@@ -196,4 +196,13 @@ class ActiveDataProvider extends BaseDataProvider
            }
        }
    }
+    
+    public function __clone() 
+    {
+        if (is_object($this->query)) {
+            $this->query = clone $this->query;
+        }
+        
+        parent::__clone();
+    }
 }