Permalink
Browse files

Merge branch 'master' of github.com:Tuxion/mokuji

Conflicts:
	CHANGES.md
	README.md
  • Loading branch information...
Beanow committed Feb 5, 2014
2 parents 104cc1f + d7d9af3 commit 9636d51ba1e666b9bca97d6dd4d9fdd9aa8a03b5
@@ -4,6 +4,11 @@ _05-Feb-2014_
* Added a CLI for actions (useful for cronjobs).
* Added database backup functionality.
#### [Version 0.28.6 Beta](https://github.com/Tuxion/mokuji/tree/0.28.6-beta)
_04-Feb-2014_
* Fixed a bug which caused "required" form fields to not actually be required for the empty value to make it to the database.
#### [Version 0.28.5 Beta](https://github.com/Tuxion/mokuji/tree/0.28.5-beta)
_30-Jan-2014_
@@ -191,8 +191,7 @@ private function _required()
return true;
}
if(!$this->check_rule('boolean')){
$this->data = false;
if($this->check_rule('boolean') === true){
return true;
}
@@ -19,7 +19,7 @@ public function render(array $options=array())
$value = $this->insert_value ? $this->value : '';
$uid = 'l_'.tx('Security')->random_string(); ?>
$uid = 'l_'.tx('Security')->random_string();
?>
<div class="ctrlHolder for_<?php echo $this->column_name; ?>">
@@ -19,7 +19,7 @@ public function render(array $options=array())
$value = $this->insert_value ? $this->value : '';
$uid = 'l_'.tx('Security')->random_string(); ?>
$uid = 'l_'.tx('Security')->random_string();
?>
<div class="ctrlHolder for_<?php echo $this->column_name; ?>">

0 comments on commit 9636d51

Please sign in to comment.