BUG: refs #164 Fixed dashboard

Charles Ma · Charles Ma · commit 159321c62215 · 2011-07-07T15:44:03.000+02:00
diff --git a/core/AppController.php b/core/AppController.php
@@ -94,7 +94,7 @@ public function preDispatch()
           if(count($tmp) == 2)
             {
             $userDao = $userModel->load($tmp[0]);
-            if($userDao!= false && md5($userDao->getPassword()) == $tmp[1])
+            if($userDao != false && md5($userDao->getPassword()) == $tmp[1])
               {
               $user->Dao = $userDao;
               }
diff --git a/core/controllers/ItemController.php b/core/controllers/ItemController.php
@@ -106,7 +106,7 @@ function viewAction()
         echo JsonComponent::encode(array(true, $this->t('Changes saved')));
         return;
         }
-      if(isset($editMetadata)&& !empty($editMetadata) && $this->view->isModerator) //remove users from group
+      if(isset($editMetadata) && !empty($editMetadata) && $this->view->isModerator) //remove users from group
         {
         $metadataId = $this->_getParam('metadataId');
         $metadatatype = $this->_getParam('metadatatype');

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function preDispatch()`
`94`	`94`	`if(count($tmp) == 2)`
`95`	`95`	`{`
`96`	`96`	`$userDao = $userModel->load($tmp[0]);`
`97`		`- if($userDao!= false && md5($userDao->getPassword()) == $tmp[1])`
	`97`	`+ if($userDao != false && md5($userDao->getPassword()) == $tmp[1])`
`98`	`98`	`{`
`99`	`99`	`$user->Dao = $userDao;`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ function viewAction()`
`106`	`106`	`echo JsonComponent::encode(array(true, $this->t('Changes saved')));`
`107`	`107`	`return;`
`108`	`108`	`}`
`109`		`- if(isset($editMetadata)&& !empty($editMetadata) && $this->view->isModerator) //remove users from group`
	`109`	`+ if(isset($editMetadata) && !empty($editMetadata) && $this->view->isModerator) //remove users from group`
`110`	`110`	`{`
`111`	`111`	`$metadataId = $this->_getParam('metadataId');`
`112`	`112`	`$metadatatype = $this->_getParam('metadatatype');`