bugfix

cetera-labs · Sep 7, 2017 · 989a2fe · 989a2fe
1 parent 0bd518f
commit 989a2fe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/cms/include/classes/Cetera/DynamicFieldsObject.php b/cms/include/classes/Cetera/DynamicFieldsObject.php
@@ -678,11 +678,11 @@ public function delete()
     {
         // удаление ссылок с удаляемого материала
         $r = $this->getDbConnection()->query("select B.name, B.len, B.type, B.pseudo_type from types A, types_fields B where A.alias='".$this->table."' and B.id=A.id and (B.type=".FIELD_LINKSET." or B.type=".FIELD_MATSET.")");
-        while ($f = $r->fetch()) {
+        while ($f = $r->fetch(\PDO::FETCH_NUM)) {
             $tbl = ObjectDefinition::get_table($f[2], $f[1], $this->objectDefinition->id, $f[3]);
             if ($f[2] != FIELD_LINKSET && $f[3] != PSEUDO_FIELD_TAGS) {
-            	$r1 = $this->getDbConnection()->query("select dest from ".$this->table."_".$tbl."_"."$f[0] where id=".$this->id);
-            	while ($f1 = $r1->fetch()) {
+            	$r1 = $this->getDbConnection()->query("select dest from ".$this->table."_".$tbl."_".$f[0]." where id=".$this->id);
+            	while ($f1 = $r1->fetch(\PDO::FETCH_NUM)) {
             	   $m = Material::getById($f1[0], $f[1], $tbl);
             	   $m->delete();
             	}

diff --git a/cms/include/constants.php b/cms/include/constants.php
@@ -11,7 +11,7 @@
  **/
 
 /** Версия */
-define('VERSION', '3.38.2');
+define('VERSION', '3.38.3');
 
 /** Название продукта */
 define('APP_NAME', 'Cetera CMS');

diff --git a/cms/include/data_tree.php b/cms/include/data_tree.php
@@ -53,9 +53,10 @@
             $where = 'id<>'.$exclude_mat;
             if ($_GET['query'])
                 $where .= ' and name LIKE '.$application->getConn()->quote('%'.$_GET['query'].'%');
-            $m = $c->getMaterials('name', $where, $matsort, '', 500, 0);
-            foreach ($m as $material)
-            {
+            //$m = $c->getMaterials('name', $where, $matsort, '', 500, 0);
+			$m = $c->getMaterials()->where($where)->setItemsCountPerPage(500);
+
+            foreach ($m as $material) {
       			$name = htmlspecialchars($material->name);
       			$name = str_replace("\n",'',$name);
       			$name = str_replace("\r",'',$name);