Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

5 years ago · 476ea0c889
parent ceb50f20b6 13b303ec8b
commit 476ea0c889
1 changed files with 1 additions and 1 deletions
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@ -140,7 +140,7 @@ unset($_REQUEST['parent_id']);
                }
            }
        }
-        $count = (I('oa_associated',-1) != -1) ? D(self::model_name)->where($map)->count() : D(self::model_name)->count();
+        $count = D(self::model_name)->where($map)->count();
        $page = set_pagination($count,$row);
        if($page) {$this->assign('_page', $page);}
        $this->assign('list_data', $list_data);