Commit Graph
91 Commits
Author SHA1 Message Date
nikrou a5c93713b6 Issue 1079: refactoring of code
git-svn-id: http://piwigo.org/svn/trunk@4001 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-10-09 08:25:34 +00:00
nikrou 2afb92238d Feature 1026 : update database structure (adding author_id)
git-svn-id: http://piwigo.org/svn/trunk@3979 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-10-06 08:42:25 +00:00
nikrou 18a4822ae3 Fix html for svn:3751 - Unclosed monotags
git-svn-id: http://piwigo.org/svn/trunk@3752 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-08-19 08:05:29 +00:00
nikrou 71774d6496 Fix for feature 1000: cannot access $conf array (use global)
git-svn-id: http://piwigo.org/svn/trunk@3750 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-08-18 19:11:01 +00:00
nikrou 513b3e0bd6 New feature : configuration option for thumbnail directory
git-svn-id: http://piwigo.org/svn/trunk@3720 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-08-02 13:04:17 +00:00
nikrou ed7f7a574e Fix two problem with Feature 1026 :
use of $conf['user_fields']['username'] and $conf['user_fields']['id'] instead of username and id
escape comment content before editing it.

git-svn-id: http://piwigo.org/svn/trunk@3452 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-06-24 19:00:40 +00:00
nikrou 64c872a83e Feature 1026 step 2 :
add author_id column so that guest cannot modify old users comments

git-svn-id: http://piwigo.org/svn/trunk@3450 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-06-23 21:18:16 +00:00
nikrou 1ce50505e4 fix html bug (li) fix comment for guest bug (form missing)
git-svn-id: http://piwigo.org/svn/trunk@3446 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-06-23 19:51:16 +00:00
nikrou 9245227e70 Feature 1026 : Modify / delete comments for users
+ update config table content
 + minor modification of Sylvia theme
 + need refactoring

git-svn-id: http://piwigo.org/svn/trunk@3445 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-06-23 13:44:58 +00:00
nikrou 1e8ae9e88b feature 1028 : Allow admin to validate comment from picture page
git-svn-id: http://piwigo.org/svn/trunk@3409 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-06-10 20:11:28 +00:00
nikrou 0ace0450a6 remove duplicate retrieved field
git-svn-id: http://piwigo.org/svn/trunk@3405 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-06-10 19:06:16 +00:00
nikrou b7f3513d7e bug fix 1024 : the way to discover protocol (http/https) was not correct
git-svn-id: http://piwigo.org/svn/trunk@3403 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-06-09 15:47:47 +00:00
nikrou 315a962558 feature 959 : improve reordering of menubar block by using drag and drop
a new jquery pluging to reodering table rows because jquery.sortable don't work well with table rows.

git-svn-id: http://piwigo.org/svn/trunk@3219 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-03-22 14:50:36 +00:00
nikrou b7fdb8b4b1 bug fix: In revision 3215 removing id break confirm javascript function
git-svn-id: http://piwigo.org/svn/trunk@3218 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-03-21 14:08:20 +00:00
nikrou 4c3b1face6 feature_948_accordion feature 948 : fix problem with incorrect submenu open in admin use a new variable (U_ACTIVE_MENU) and use default position defined in selected_admin_menu if not exists
git-svn-id: http://piwigo.org/svn/trunk@3216 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-03-19 20:30:10 +00:00
nikrou 2b9d21eb78 fix several html bugs
we must find a way to fix the problem of empty select

git-svn-id: http://piwigo.org/svn/trunk@3215 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-03-19 19:51:54 +00:00
nikrou 4f425390b8 fix html bug (<li> not needed)
git-svn-id: http://piwigo.org/svn/trunk@3213 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-03-18 14:31:14 +00:00
nikrou bfdc96a1a2 feature:940 fix problem with ie7
git-svn-id: http://piwigo.org/svn/trunk@3209 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-03-17 16:48:04 +00:00
nikrou c53c9523a8 feature:940 first step reordering with jquery
git-svn-id: http://piwigo.org/svn/trunk@3201 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-03-16 09:31:37 +00:00
nikrou dc6176db21 fix html warnings. unclosed monotags
git-svn-id: http://piwigo.org/svn/trunk@3189 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-03-11 19:41:21 +00:00
nikrou bea3462f56 fix html warnings. unclosed monotags
git-svn-id: http://piwigo.org/svn/trunk@3185 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-03-09 19:41:45 +00:00
nikrou 10e179f482 bug fix #933 : quick fix to prevent html injection
git-svn-id: http://piwigo.org/svn/trunk@3184 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-03-08 12:34:32 +00:00
nikrou 72b2c126c4 improve task:0000902:
- add image del_all_favorites.png
- make a redirect after delete

git-svn-id: http://piwigo.org/svn/trunk@3039 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-01-03 19:38:53 +00:00
nikrou b225a52b91 task:0000902: button to remove all favorites
git-svn-id: http://piwigo.org/svn/trunk@3037 68402e56-0260-453c-a942-63ccdbb3a9ee
2009-01-02 20:57:56 +00:00
nikrou 2ea8ea880d bug fix: non valid html id needed for label
git-svn-id: http://piwigo.org/svn/trunk@3008 68402e56-0260-453c-a942-63ccdbb3a9ee
2008-12-21 13:20:14 +00:00
nikrou eef8aa8838 $_SERVER["HTTP_ACCEPT_LANGUAGE"] could be empty so test it.
git-svn-id: http://piwigo.org/svn/trunk@2537 68402e56-0260-453c-a942-63ccdbb3a9ee
2008-09-14 19:40:18 +00:00
nikrou 9474d5cc67 real static param
git-svn-id: http://piwigo.org/svn/trunk@2536 68402e56-0260-453c-a942-63ccdbb3a9ee
2008-09-14 19:40:12 +00:00
nikrou fae1a63124 fix too strict regex for email
git-svn-id: http://piwigo.org/svn/trunk@2507 68402e56-0260-453c-a942-63ccdbb3a9ee
2008-09-07 11:05:15 +00:00
nikrou 49d878b326 mispellin variable
git-svn-id: http://piwigo.org/svn/trunk@2505 68402e56-0260-453c-a942-63ccdbb3a9ee
2008-09-06 12:47:32 +00:00
nikrou bc1f5319b1 fix bug 518: anyone can delete or validate a comment
comment_id must be int: use of intval function to use it in the query.

svn merge -r1534:1535 from branch 1.6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1536 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-08-14 20:57:50 +00:00
nikrou 9d38573074 fix bug 510: missing permission link
svn merge -r1527:1528 from branch 1.6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1529 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-08-09 12:34:55 +00:00
nikrou e37424d1c1 line (error_log('...')) not wanted: debug
git-svn-id: http://piwigo.org/svn/trunk@1527 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-08-08 06:54:57 +00:00
nikrou 5ae82cf8d4 bug 451 fixed: in auto_login function slashes must be remove
before unserializing data contains in remember cookie


git-svn-id: http://piwigo.org/svn/trunk@1526 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-08-07 13:39:19 +00:00
nikrou 4a354ba64a fix bug 451:
password.php and register.php must be accessible when user is guest 
even if guest user is not allowed.


git-svn-id: http://piwigo.org/svn/trunk@1524 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-08-02 21:19:15 +00:00
nikrou 3723a95a6c fix bug 451:
when guest access in not allowed identification.php script try
to redirect to himself ad infinitum.


git-svn-id: http://piwigo.org/svn/trunk@1522 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-08-01 13:33:21 +00:00
nikrou 7fdd547b1a revert to svn:1507
block refresh is used in slideshows

fix line too long.


git-svn-id: http://piwigo.org/svn/trunk@1512 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-07-28 14:07:57 +00:00
nikrou 1873dbd062 Fix bug 451: improvement
small problem with reconnexion after session timeout
add auto-login function
all staff for session (connexion, auto-login and logout) 
is now in include/user.inc.php


git-svn-id: http://piwigo.org/svn/trunk@1511 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-07-28 09:34:27 +00:00
nikrou f6c2f2b1b1 refresh_time must be 0 by default
fix line too long


git-svn-id: http://piwigo.org/svn/trunk@1510 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-07-28 08:36:38 +00:00
nikrou 96bc8e8717 Fixed missing $lang and extra code not needed
git-svn-id: http://piwigo.org/svn/trunk@1509 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-07-28 08:01:08 +00:00
nikrou bc65a0d6cd Feature 492: first step
Simple redirect.tpl in template-common
Simplification of function redirect()


git-svn-id: http://piwigo.org/svn/trunk@1508 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-07-27 18:51:54 +00:00
nikrou e7f8b14269 function names are case-insensitive but it's a good idea to call functions
as they appear in their declaration. 
So all functions names that manipulate url like make_index_url() 
are write with lowercase


git-svn-id: http://piwigo.org/svn/trunk@1503 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-07-26 21:00:16 +00:00
nikrou 1150fb7add fix bug 486: field username too small
git-svn-id: http://piwigo.org/svn/trunk@1495 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-07-25 07:40:02 +00:00
nikrou f1129e48b3 small improvement (related to bug 451): incorrect auto_login_key
dont delete key in users table but just delete remember_me cookie


git-svn-id: http://piwigo.org/svn/trunk@1494 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-07-24 15:49:16 +00:00
nikrou 5d06d43541 bug 451 fixed: problem with auto login
- add an auto_login_key in users_table
- $conf['session_length'] is no more useful 
    and sessions length will be 0 (until browser closed)
- add $conf['remember_me_name'] for cookie remember name


git-svn-id: http://piwigo.org/svn/trunk@1493 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-07-23 15:25:49 +00:00
nikrou a15839b183 bug 482 fixed: deletion of our account must be impossible
git-svn-id: http://piwigo.org/svn/trunk@1489 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-07-21 15:28:09 +00:00
nikrou de1ff24582 bug 471 fixed: quote in tags
git-svn-id: http://piwigo.org/svn/trunk@1487 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-07-21 13:44:22 +00:00
nikrou 3ec2f102b5 fix bug 375: html bug; warnings are displayed outside from the html tree.
git-svn-id: http://piwigo.org/svn/trunk@1380 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-06-22 21:28:54 +00:00
nikrou 17d13cef8d fix bug 428: blank page when gd extension missing
svn merge -r1377:1378 from branch 1.6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1379 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-06-22 19:41:32 +00:00
nikrou a08cd1a583 svn merge -r1366:1371 from branch 1.6 into trunk
git-svn-id: http://piwigo.org/svn/trunk@1377 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-06-22 19:21:56 +00:00
nikrou ad45eccd33 issue 426 step 1 reverted:
svn merge -r1466:1465 .
svn merge -r1463:1462 .


git-svn-id: http://piwigo.org/svn/trunk@1376 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-06-22 18:17:47 +00:00
nikrou 84536f0275 fix bug 431: src of image are incorrect:
ex: ././galleries/img.jpg instead of ./galleries/img.jpg


git-svn-id: http://piwigo.org/svn/trunk@1374 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-06-21 19:34:46 +00:00
nikrou 98b5d375e4 small fix: problem with undefined constant in public zone.
git-svn-id: http://piwigo.org/svn/trunk@1366 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-06-18 18:39:43 +00:00
nikrou 57cf3ba758 Issue 426: first step; separation of admin and public into two templates
Need to simplify and delete files not needed


git-svn-id: http://piwigo.org/svn/trunk@1363 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-06-18 12:04:59 +00:00
nikrou 006eecb3d6 bug 422 fixed: invalid html
git-svn-id: http://piwigo.org/svn/trunk@1359 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-06-16 20:14:48 +00:00
nikrou 57a108d957 bug 423 fixed: & non encoded in image url
svn merge -r1356:1357 from branch 1.6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1358 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-06-16 18:47:25 +00:00
nikrou bf57ab7501 small css fix: no comma
svn merge -r1354:1355 from branch 1.6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1356 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-06-15 20:49:39 +00:00
nikrou c32f43f225 html bug fixed: the sentence "mod adviser enabled" must be add in the page!
git-svn-id: http://piwigo.org/svn/trunk@1299 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-05-05 20:07:49 +00:00
nikrou aafda98e97 bug 331 fixed: html generated contains the code in header.tpl twice
when we use the function redirect
svn merge -r1296:1297 from branch 1.6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1298 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-05-03 17:24:19 +00:00
nikrou 0997165e0b atrribute target not allowed in html strict
svn merge -r1292:1293 from branch 1.6


git-svn-id: http://piwigo.org/svn/trunk@1294 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-04-29 15:40:44 +00:00
nikrou a89ecb6e41 bug fixed: popuhelp (slash)
svn merge -r1248:1249 from branch-1_6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1250 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-04-21 21:16:37 +00:00
nikrou 6a52288d62 bug fixed: popuhelp
svn merge from branch-1_6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1246 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-04-21 21:09:26 +00:00
nikrou 01f80a1415 bug fixed: add test on $_POST['list']
problem when clicking on validate-all or remove-all
and when the list of waiting is empty

svn merge -r1234:1235 from branch-1_6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1245 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-04-21 21:08:28 +00:00
nikrou 7e317bdbc3 html bug fixed
svn merge -r1238:1240,1242 from branch-1_6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1244 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-04-21 21:07:19 +00:00
nikrou efc05de9d4 bug 308: improve correction
svn merge -r1190:1191 from branch1_6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1192 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-04-17 15:13:32 +00:00
nikrou 1f50a3dc1c html bug fixed: the closed div for comments must be in the comments block
because of categories with comments not allowed
svn merge -r1165:1166 from branche 1.6


git-svn-id: http://piwigo.org/svn/trunk@1167 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-04-14 10:45:59 +00:00
nikrou 74dc25dca8 -bug 308 fixed: problem when updating session
git-svn-id: http://piwigo.org/svn/trunk@1164 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-04-14 09:49:06 +00:00
nikrou dffa074a1c missing vocabulary for tag added and tag already exists
merge -r1151:1152 from branch-1_6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1155 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-04-12 15:03:17 +00:00
nikrou 57e894ca8d bug fixed: add test on $_POST['list']
problem when clicking on validate-all or remove-all 
and when the list of comments is empty
merge -r1150:1151 from branch-1_6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1154 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-04-12 15:02:22 +00:00
nikrou 487d0565b0 fixed html bug: name removed and tag "a" must not be closed before label
merge -r1149:1150 from branch-1_6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1153 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-04-12 15:01:14 +00:00
nikrou a820112d59 merge from branch-1_6 into trunk:
svn merge -r1141:1142


git-svn-id: http://piwigo.org/svn/trunk@1143 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-04-09 14:50:14 +00:00
nikrou 1b1400c3c8 Correction: invalid html
git-svn-id: http://piwigo.org/svn/trunk@1104 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-03-26 17:57:03 +00:00
nikrou 4fca49194f small corrections:
- bug 312 partially fixed
- bug 295 fixed


git-svn-id: http://piwigo.org/svn/trunk@1103 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-03-26 14:17:15 +00:00
nikrou 587974e54f mistake: double input tag
git-svn-id: http://piwigo.org/svn/trunk@1101 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-03-25 13:21:59 +00:00
nikrou 3cc303281f profile.tpl: small correction
Identification.tpl: accessibility improvement using tabindex


git-svn-id: http://piwigo.org/svn/trunk@1100 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-03-25 12:57:30 +00:00
nikrou 56039d0e7b Small corrections
git-svn-id: http://piwigo.org/svn/trunk@1099 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-03-25 12:47:49 +00:00
nikrou 2a01c7472a bug 287 fixed: params nb_image_line and nb_line_page must be not null scalar
git-svn-id: http://piwigo.org/svn/trunk@1043 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-02-15 20:44:33 +00:00
nikrou 2dc2eb8630 not include .svn directory in the candidates (get_dirs function) for new themes
git-svn-id: http://piwigo.org/svn/trunk@1035 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-02-12 16:05:49 +00:00
nikrou db93405255 The session garbage collector should not be called when a session is closed
git-svn-id: http://piwigo.org/svn/trunk@1034 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-02-12 14:08:57 +00:00
nikrou 512740968f small modification: we can now store any information in sessions
(cf topic:5667)

git-svn-id: http://piwigo.org/svn/trunk@1032 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-02-11 13:23:54 +00:00
nikrou c8e9793412 merge branch 1.5 into trunk r1001:1002: bug 259 fixed
git-svn-id: http://piwigo.org/svn/trunk@1030 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-02-09 20:38:07 +00:00
nikrou 701350ff05 Languages corrections: bug 225, 237, 248, 257, 258 fixed
git-svn-id: http://piwigo.org/svn/trunk@1025 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-02-04 21:54:16 +00:00
nikrou f72468a9cd html error: title_send_mail should be encoded
git-svn-id: http://piwigo.org/svn/trunk@1024 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-02-04 20:55:22 +00:00
nikrou dd8d571761 fixed problem of cookie session path
fixed problem of undefined variable conf in upgrade_feed.php
fixed problem of undefined index is_the_guest of tab variable user

git-svn-id: http://piwigo.org/svn/trunk@1023 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-02-03 16:19:56 +00:00
nikrou a4d50dabf8 - merge branch 1.5 r1015:1016 into trunk (bug 277 fixed)
Caddie text is always in english

git-svn-id: http://piwigo.org/svn/trunk@1017 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-01-28 13:34:07 +00:00
nikrou 02f08d3c4f merge branch 1.5 r1010:1011 into BSF:
- bug 268 fixed: display debug content correctly

git-svn-id: http://piwigo.org/svn/trunk@1012 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-01-21 20:38:29 +00:00
nikrou 0b28c9da75 improve sessions: add comments to functions
git-svn-id: http://piwigo.org/svn/trunk@1010 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-01-21 10:56:36 +00:00
nikrou 9410522e9f bug fix 261: improve security of sessions (next to svn:1004):
- improve presentation code style
- add upgrade database file

git-svn-id: http://piwigo.org/svn/trunk@1007 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-01-18 15:16:30 +00:00
nikrou 9e1fabeaf7 - merge branch 1.5 r1000:1001 into BSF:
not include .svn directory in the candidates directories for update

git-svn-id: http://piwigo.org/svn/trunk@1006 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-01-17 20:40:16 +00:00
nikrou c3397a2c73 Improve security of sessions:
- use only cookies to store session id on client side
- use default php session system with database handler to store sessions on server side

git-svn-id: http://piwigo.org/svn/trunk@1004 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-01-15 13:45:42 +00:00
nikrou b223bb495d - merge -r998:999 from branches/branch-1_5 into trunk (bug 260 fixed)
git-svn-id: http://piwigo.org/svn/trunk@1000 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-01-07 13:10:44 +00:00
nikrou 00157ca52b merge -r960:997 from branches/branch-1_5 into trunk (bug 238 fixed)
git-svn-id: http://piwigo.org/svn/trunk@998 68402e56-0260-453c-a942-63ccdbb3a9ee
2006-01-01 17:19:56 +00:00