aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-08-17 19:56:07 +0000
committerplegall <plg@piwigo.org>2011-08-17 19:56:07 +0000
commit64ba898944da2aaf0a7f5ebe07d96036b88dea68 (patch)
treeb6f462879a4f8187fb7084b8bdf5ec9bd459c231 /include
parente255cd8c2f0a920b033b76045f417f9c416c27b8 (diff)
feature 2406 added: if the user wants a new album in the upload form, the album
is created before the start of the upload. The ergonomy is now simpler, the page is smaller and cleaner. bug 2373 fixed: now that album is created before upload, uploadify.php gets the category_id and the level: as soon as it is uploaded (function add_uploaded_file) the photo gets its final privacy level and is directly associated to the album. This way, we can have an error on a photo without making orphan all photos of the same upload group. feature 2405 added: as soon as a photo is uploaded, its thumbnail is displayed in the "Uploaded Photos" fieldset, without waiting for other photos to be uploaded. The latest photos comes first. I have slighlty changed the integration of colorbox in core. Now we have 2 styles available and by default, we use style2 (overlay in black, title and control icons outside the popup). It is also used for zooming on bulk manager in unit mode. display change: on each uploading photos, instead of showing the transfer speed, we display the transfer progression in % bug fixed: the color of the "Start Upload" button was not correct because the button was not a submit button but a simple type=button. language: "Upload" button becomes "Start Upload" button. git-svn-id: http://piwigo.org/svn/trunk@11962 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/ws_functions.inc.php21
1 files changed, 14 insertions, 7 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index af96a360a..61f655d23 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -511,13 +511,20 @@ SELECT id, name, permalink, uppercats, global_rank, id_uppercat,
$row[$key] = (int)$row[$key];
}
- $row['name'] = strip_tags(
- trigger_event(
- 'render_category_name',
- $row['name'],
- 'ws_categories_getList'
- )
- );
+ if ($params['fullname'])
+ {
+ $row['name'] = strip_tags(get_cat_display_name_cache($row['uppercats'], null, false));
+ }
+ else
+ {
+ $row['name'] = strip_tags(
+ trigger_event(
+ 'render_category_name',
+ $row['name'],
+ 'ws_categories_getList'
+ )
+ );
+ }
$row['comment'] = strip_tags(
trigger_event(