Skip to content
Snippets Groups Projects
Commit b5a50cc3 authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge branch 'hotline_6.45' into 'master'

Hotline 6.45
parents 578c507a 31b548ce
Branches
Tags
5 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!215Dev#12992 Custom Fields,!209Hotline#13914 Album Link Config Menu,!180Master,!175Master
10/06/2014 - v6.45.1
- Correction régression dans le chargement des préférences par défaut des modules pouvant entraîner un écran blanc.
10/06/2014 - v6.45
- ticket #13014: navigation dans les notices
- les liens document précédent / suivant sont identifiés par les id #previousrecord et #nextrecord
......
......@@ -1389,7 +1389,7 @@ class Class_Profil extends Storm_Model_Abstract {
* @return bool
*/
public function isPortail() {
return 1 === $this->getId();
return 1 === (int)$this->getId();
}
......
......@@ -56,7 +56,7 @@ function defineConstant($name, $value) {
function setupConstants() {
defineConstant('VERSION_PERGAME','6.45');
defineConstant('RELEASE_NUMBER', VERSION_PERGAME.'.0');
defineConstant('RELEASE_NUMBER', VERSION_PERGAME.'.1');
defineConstant('ROOT_PATH', realpath(dirname(__FILE__).'/..').'/');
......
......@@ -1368,4 +1368,32 @@ class ProfilPreferenceAuthRegisterTest extends Storm_Test_ModelTestCase {
$this->youth->getModulePreference('auth', 'register', 'register_confirm'));
}
}
class ProfilIsPortalTest extends Storm_Test_ModelTestCase {
/** @test */
public function profilWithIdOneIntShouldBePortal() {
$this->assertTrue($this->fixture('Class_Profil', ['id' => 1])->isPortail());
}
/** @test */
public function profilWithIdOneStringShouldBePortal() {
$this->assertTrue($this->fixture('Class_Profil', ['id' => '1'])->isPortail());
}
/** @test */
public function profilWithIdSevenIntShouldBePortal() {
$this->assertFalse($this->fixture('Class_Profil', ['id' => 7])->isPortail());
}
/** @test */
public function profilWithIdSevenStringShouldNotBePortal() {
$this->assertFalse($this->fixture('Class_Profil', ['id' => '7'])->isPortail());
}
}
?>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment