diff --git a/config/settings.php b/config/settings.php index aa81123..eacebae 100644 --- a/config/settings.php +++ b/config/settings.php @@ -30,7 +30,7 @@ |--------------------------------------------------------------------------| */ - 'copyright' => 'PongoCMS v1.2 rc1.1.10 © pongoweb.it', + 'copyright' => 'PongoCMS v1.2 rc1.1.11 © pongoweb.it', /* |-------------------------------------------------------------------------- diff --git a/models/cmselement.php b/models/cmselement.php index 44a283e..f89bf69 100644 --- a/models/cmselement.php +++ b/models/cmselement.php @@ -15,7 +15,8 @@ public function user() public function pages() { - return $this->has_many_and_belongs_to('CmsPage', 'elements_pages') + return $this->has_many_and_belongs_to('CmsPage', 'elements_pages') + ->order_by('zone', 'asc') ->order_by('elements_pages.order_id', 'asc'); } diff --git a/models/cmspage.php b/models/cmspage.php index a7bf1f2..cbc71e2 100644 --- a/models/cmspage.php +++ b/models/cmspage.php @@ -21,8 +21,8 @@ public function user() public function elements() { return $this->has_many_and_belongs_to('CmsElement', 'elements_pages') - ->order_by('elements_pages.order_id', 'asc') - ->order_by('zone', 'asc'); + ->order_by('zone', 'asc') + ->order_by('elements_pages.order_id', 'asc'); } public function files()