diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9501566..7cfa881 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -44,6 +44,7 @@ jobs: MYSQL_VERSION: ${{ matrix.mysql }} MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: cakephp_test + COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 diff --git a/Controller/PagesEditController.php b/Controller/PagesEditController.php index 6c05370..d648467 100644 --- a/Controller/PagesEditController.php +++ b/Controller/PagesEditController.php @@ -660,21 +660,22 @@ private function __hasDeletePage() { * @return bool */ private function __hasDeleteThisPage() { - $activeLangs = $this->Language->getLanguages(); - if (! Current::read('Space.is_m17n') && count($activeLangs) <= 1) { - return false; - } - - $hasDeletePage = $this->__hasDeletePage(); - if (! $hasDeletePage) { - return false; - } - - $activeLangIds = Hash::extract($activeLangs, '{n}.Language.id'); - - $pageIdsM17n = $this->Page->getPageIdsWithM17n(Current::read('Page.id')); - - return (bool)array_diff($activeLangIds, Hash::get($pageIdsM17n, Current::read('Page.id'), [])); + return false; + //$activeLangs = $this->Language->getLanguages(); + //if (! Current::read('Space.is_m17n') && count($activeLangs) <= 1) { + // return false; + //} + // + //$hasDeletePage = $this->__hasDeletePage(); + //if (! $hasDeletePage) { + // return false; + //} + // + //$activeLangIds = Hash::extract($activeLangs, '{n}.Language.id'); + // + //$pageIdsM17n = $this->Page->getPageIdsWithM17n(Current::read('Page.id')); + // + //return (bool)array_diff($activeLangIds, Hash::get($pageIdsM17n, Current::read('Page.id'), [])); } } diff --git a/VERSION.txt b/VERSION.txt index fa7adc7..9c25013 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.5 +3.3.6