Skip to content

Commit

Permalink
Merge branch '21-0-bug'
Browse files Browse the repository at this point in the history
  • Loading branch information
phpfunk committed Mar 10, 2014
2 parents 9b0b092 + 47bbb11 commit f90a17f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion application/core/Plain_Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ protected function addMark($data=array())
// Set default options
$options = array('user_id' => $this->user_id, 'mark_id' => $mark->mark_id);

// Label ID (not required)
// Label ID (not required), if set and numeric and greater than 0, use it
if (isset($data['label_id']) && is_numeric($data['label_id']) && $data['label_id'] > 0) {
$options['label_id'] = $data['label_id'];
}
Expand Down

0 comments on commit f90a17f

Please sign in to comment.