public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Fix variable not defined error

Browse Source
This commit is contained in:
hukoeth 2010-09-18 17:42:29 +08:00 committed by Bharat Mediratta
parent 47ba44fe04
commit 6b4fa801bc
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/photoannotation/helpers/photoannotation.php
View File

@ -230,17 +230,6 @@ class photoannotation_Core {
}
return $notification_settings;
}
public static function get_user_cloud() {
$users = ORM::factory("user")->order_by("name", "ASC")->find_all();
foreach ($users as $user) {
$items_users_count = ORM::factory("items_user")->where("user_id", "=", $user->id)->count_all();
if ($items_users_count > 0) {
$user_array[] = $user->display_name();
}
}
return $user_array;
}
static function cloud($count) {
$users = ORM::factory("user")->order_by("name", "ASC")->find_all();
@ -262,12 +251,13 @@ class photoannotation_Core {
$user_array[$user->name]->url = user_profile::url($user->id);
}
}
$cloud->users = array_slice($user_array, 0, $count);
$cloud->max_count = $maxcount;
if (!$cloud->max_count) {
return;
if (isset($user_array)) {
$cloud->users = array_slice($user_array, 0, $count);
$cloud->max_count = $maxcount;
return $cloud;
} else {
return "";
}
return $cloud;
}
}

2
modules/photoannotation/helpers/photoannotation_theme.php
View File

@ -38,7 +38,7 @@ class photoannotation_theme_Core {
} else {
$border_thickness = "1px";
}
if (!$noborder || !$noeditablehover || !$nohover) {
if (!$noborder || !$noclickablehover || !$nohover) {
if (!$noborder) {
$v .= ".image-annotate-area {\n
border: 1px solid ". $bordercolor .";\n