diff options
| -rw-r--r-- | modules/search/views/search.html.php | 15 | ||||
| -rw-r--r-- | modules/user/models/user.php | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php index fdf22a9e..2e139ecf 100644 --- a/modules/search/views/search.html.php +++ b/modules/search/views/search.html.php @@ -23,18 +23,15 @@ <? if (count($items)): ?> <ul id="g-album-grid" class="ui-helper-clearfix"> <? foreach ($items as $item): ?> - <? $item_class = "g-photo"; ?> - <? if ($item->is_album()): ?> - <? $item_class = "g-album"; ?> - <? endif ?> - <li class="g-item <?= $item_class ?>"> + <? $item_class = $item->is_album() ? "g-album" : "g-photo" ?> + <li class="g-item <?= $item_class ?>"> <a href="<?= $item->url() ?>"> <?= $item->thumb_img() ?> <p> - <?= html::purify($item->title) ?> - </p> - <div> - <?= nl2br(html::purify($item->description)) ?> + <?= html::purify(text::limit_chars($item->title, 32, "…")) ?> + </p> + <div> + <?= nl2br(html::purify(text::limit_chars($item->description, 64, "…"))) ?> </div> </a> </li> diff --git a/modules/user/models/user.php b/modules/user/models/user.php index 184ce70a..bd61def8 100644 --- a/modules/user/models/user.php +++ b/modules/user/models/user.php @@ -23,7 +23,7 @@ class User_Model extends ORM implements User_Definition { var $rules = array( "name" => "required|length[1,32]", "full_name" => "length[0,255]", - "email" => "valid_email|length[1,255]", + "email" => "required|valid_email|length[1,255]", "password" => "length[1,40]", "url" => "valid_url", "locale" => "length[2,10]"); |