diff options
| author | michael pereira | 2011-04-21 14:03:59 +0200 |
|---|---|---|
| committer | michael pereira | 2011-04-21 14:03:59 +0200 |
| commit | daf6e795d126ec49e25e8b40931470e3c63666a9 (patch) | |
| tree | 3368e0e2c463bfa9d77478dce2dc142ae7428836 /application/modules/user/controllers/BootisoController.php | |
| parent | updates raus (diff) | |
| parent | Userpasswort verschlüsselung (diff) | |
| download | pbs2-daf6e795d126ec49e25e8b40931470e3c63666a9.tar.gz pbs2-daf6e795d126ec49e25e8b40931470e3c63666a9.tar.xz pbs2-daf6e795d126ec49e25e8b40931470e3c63666a9.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/controllers/BootisoController.php')
| -rw-r--r-- | application/modules/user/controllers/BootisoController.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php index 18472a9..e83a2c5 100644 --- a/application/modules/user/controllers/BootisoController.php +++ b/application/modules/user/controllers/BootisoController.php @@ -97,7 +97,10 @@ class user_BootisoController extends Zend_Controller_Action $bootiso->setPrebootID("[".$bootiso->getPrebootID()."] ".$prebootMapper->find($bootiso->getPrebootID())->getTitle()); $bootiso->setGroupID("[".$bootiso->getGroupID()."] ".$groupMapper->find($bootiso->getGroupID())->getTitle()); $bootiso->setCreated(date(Zend_Registry::get('dateformat'),$bootiso->getCreated())); - @$bootiso->setExpires(date(Zend_Registry::get('dateformat'),$bootiso->getExpires())); + if($bootiso->getExpires() == ""){ + $bootiso->setExpires(0); + } + $bootiso->setExpires(date(Zend_Registry::get('dateformat'),$bootiso->getExpires())); } // Search |