Overview
Comment: | Fix session issues when updating |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA3-256: |
0a9fbcfca8eac28d2df8288ed792e9bb |
User & Date: | bohwaz on 2021-03-30 20:51:49 |
Other Links: | branch diff | manifest | tags |
Context
2021-03-30
| ||
20:59 | Fix skriv rendering for format_skriv check-in: 0917eeafc4 user: bohwaz tags: dev | |
20:51 | Fix session issues when updating check-in: 0a9fbcfca8 user: bohwaz tags: dev | |
2021-03-29
| ||
23:33 | Fix preview in skriv editor in documents check-in: 266c0e4891 user: bohwaz tags: dev | |
Changes
Modified src/include/lib/Garradin/Membres/Session.php from [9d364b055d] to [cad7b6bcbf].
︙ | ︙ | |||
341 342 343 344 345 346 347 348 | public function canAccess($category, $permission) { if (!$this->getUser()) { return false; } | > > | | 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 | public function canAccess($category, $permission) { if (!$this->getUser()) { return false; } $perm_name = 'perm_' . $category; $perm = $this->getUser()->$perm_name; return ($perm >= $permission); } public function requireAccess($category, $permission) { if (!$this->canAccess($category, $permission)) { throw new UserException('Vous n\'avez pas le droit d\'accéder à cette page.'); |
︙ | ︙ |
Modified src/include/lib/Garradin/Upgrade.php from [12266141f1] to [c4f3076366].
︙ | ︙ | |||
31 32 33 34 35 36 37 | { $path = Static_Cache::getPath('upgrade'); throw new UserException('Une mise à jour est déjà en cours.' . PHP_EOL . 'Si celle-ci a échouée et que vous voulez ré-essayer, supprimez le fichier suivant:' . PHP_EOL . $path); } | < < < < | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | { $path = Static_Cache::getPath('upgrade'); throw new UserException('Une mise à jour est déjà en cours.' . PHP_EOL . 'Si celle-ci a échouée et que vous voulez ré-essayer, supprimez le fichier suivant:' . PHP_EOL . $path); } return true; } static public function upgrade() { $db = DB::getInstance(); $v = $db->version(); |
︙ | ︙ |