Merge branch 'Piwigo:master' into master

admin/include/functions_metadata.php

@@ -103,7 +103,13 @@ function get_sync_exif_data($file)
     {
       $exif[$pwg_key] = metadata_normalize_keywords_string($exif[$pwg_key]);
     }
-    
+
+    if (empty($exif[$pwg_key]))
+    {
+      unset($exif[$pwg_key]);
+      continue;
+    }
+
     $exif[$pwg_key] = addslashes($exif[$pwg_key]);
   }
 

admin/themes/default/css/components/album_selector.css

@@ -164,6 +164,10 @@
   text-align: left;
 }
 
+.search-result-path-name {
+  unicode-bidi: plaintext;
+}
+
 .search-result-subcat-item {
   display: none;
 }

admin/themes/default/js/album_selector.js

@@ -486,7 +486,7 @@ class AlbumSelector {
           `<div class="search-result-item" id="${cat.id}">
               ${subcat}
               <div class="prefill-results-item available" id="${cat.id}">
-                <span class="search-result-path">${cat.name}</span>
+                <span class="search-result-path"><span class="search-result-path-name">${cat.name}</span></span>
                 <span id=${cat.id}" class="${iconAlbum} item-add"></span>
               </div>
             </div>`
@@ -496,7 +496,7 @@ class AlbumSelector {
           `<div class="search-result-item already-in" id="${cat.id}" title="${str_album_selected}">
               ${subcat}
               <div class="prefill-results-item" id="${cat.id}">
-                <span class="search-result-path">${cat.name}</span> 
+                <span class="search-result-path"><span class="search-result-path-name">${cat.name}</span></span> 
                 <span id="${cat.id}" class="gallery-icon-plus-circled item-add notClickable" title="${str_album_selected}"></span>
               </div>
             </div>`

admin/themes/default/js/albums.js

@@ -716,6 +716,10 @@ function applyMove(event) {
   } else if (event.move_info.position == 'inside') {
     if (getId(previous_parent) != getId(target)) {
       moveParent = getId(target);
+      const currentNode = $('.tree').tree('getNodeById', moveParent);
+      if (currentNode && currentNode.load_on_demand && currentNode.haveChildren) {
+        loadOnDemand(currentNode);
+      }
     }
     moveRank = 1;
   } else if (event.move_info.position == 'before') {

admin/themes/default/template/footer.tpl

@@ -45,21 +45,21 @@
         <div class="whats_new_block_container">
           <div class="whats_new_block icon-yellow">
             <h4>{'A new interface for user management'|translate}</h4>
-            <img src="{$WHATS_NEW_IMGS.1}">
+            <a href="{$RELEASE_NOTE_URL}" target="_blank"><img src="{$WHATS_NEW_IMGS.1}"></a>
           </div>
           <div class="whats_new_block icon-green">
             <h4>{'Brand new features : Activities logs and PDF reader'|translate}</h4>
-            <img src="{$WHATS_NEW_IMGS.2}">
+            <a href="{$RELEASE_NOTE_URL}" target="_blank"><img src="{$WHATS_NEW_IMGS.2}"></a>
           </div>
         </div>
         <div class="whats_new_block_container">
           <div class="whats_new_block icon-blue">
             <h4>{'Enhanced interface for batch manager and album selector'|translate}</h4>
-            <img src="{$WHATS_NEW_IMGS.3}">
+            <a href="{$RELEASE_NOTE_URL}" target="_blank"><img src="{$WHATS_NEW_IMGS.3}"></a>
           </div>
           <div class="whats_new_block icon-purple">
             <h4>{'Even more filters for the gallery search engine'|translate}</h4>
-            <img src="{$WHATS_NEW_IMGS.4}">
+            <a href="{$RELEASE_NOTE_URL}" target="_blank"><img src="{$WHATS_NEW_IMGS.4}"></a>
           </div>
         </div>
       </div>

admin/themes/default/template/plugins_new.tpl

@@ -13,7 +13,7 @@
 
 {footer_script}
 const str_confirm_msg = "{"Yes, I am sure"|@translate}";
-const str_cancel_msg = "{"No, I have chaged my mind"|@translate}";
+const str_cancel_msg = "{"No, I have changed my mind"|@translate}";
 const str_install_title = "{'Are you sure you want to install the plugin "%s"?'|@translate|@escape:'javascript'}";
 const strs_certification = {
   "-1" : "{'This plugin is incompatible with your version'|@translate}",
@@ -212,4 +212,4 @@ const str_from_begining = "{"since the beginning"|@translate}";
   <a href="{$BETA_URL}" class="buttonLike icon-fire">{'Show beta test plugins'|@translate}</a>
 {/if}
 </p>
-{/if}
+{/if}

include/search_filters.inc.php

@@ -214,6 +214,7 @@ SELECT
         }
       }
     }
+    krsort($date_posted['list_of_dates']);
 
     $template->assign('LIST_DATE_POSTED', $date_posted['list_of_dates']);
     $template->assign('DATE_POSTED', $counters);
@@ -317,6 +318,8 @@ SELECT
         }
       }
     }
+    krsort($date_created['list_of_dates']);
+
     $template->assign('LIST_DATE_CREATED', $date_created['list_of_dates']);
     $template->assign('DATE_CREATED', $counters);
   }

include/ws_functions/pwg.images.php

@@ -2641,6 +2641,12 @@ SELECT *
       return new PwgError(WS_ERR_INVALID_PARAM, 'Do not use tag_list and tag_ids at the same time.');
     }
 
+    // clean user input
+    foreach ($_REQUEST['tag_list'] as $idx => $tag_candidate)
+    {
+      $_REQUEST['tag_list'][$idx] = pwg_db_real_escape_string(strip_tags(stripslashes($tag_candidate)));
+    }
+
     $tag_list = get_tag_ids($_REQUEST['tag_list']);
     set_tags($tag_list, $params['image_id']);
   }  

install.php

@@ -487,7 +487,7 @@ else
     $user = build_user(1, true);
     log_user($user['id'], false);
 
-    $user['preferences']['show_whats_new_'.get_branch(PHPWG_VERSION)] = false;
+    $user['preferences']['show_whats_new_'.get_branch_from_version(PHPWG_VERSION)] = false;
     
     // newsletter subscription
     if ($is_newsletter_subscribe)