Feature 511 : fix problems with calendar functions

add pwg_db_concat() function

git-svn-id: http://piwigo.org/svn/trunk@4833 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 4 insertions, 4 deletions

diff --git a/admin/include/functions.php b/admin/include/functions.php
index 881a87e5b..d77b2cb81 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -948,7 +948,7 @@ SELECT DISTINCT(storage_category_id)
   {
     $query = '
 UPDATE '.IMAGES_TABLE.'
-  SET path = CONCAT(\''.$fulldirs[$cat_id].'\',\'/\',file)
+  SET path = '.pwg_db_concat(array($fulldirs[$cat_id],'\'/\'','file')).'
   WHERE storage_category_id = '.$cat_id.'
 ;';
     pwg_query($query);
diff --git a/admin/include/functions_permalinks.php b/admin/include/functions_permalinks.php
index f619e3b08..94c13be31 100644
--- a/admin/include/functions_permalinks.php
+++ b/admin/include/functions_permalinks.php
@@ -192,8 +192,8 @@ DELETE FROM '.OLD_PERMALINKS_TABLE.'
   $query = '
 UPDATE '.CATEGORIES_TABLE.'
   SET permalink="'.$permalink.'"
-  WHERE id='.$cat_id.'
-  LIMIT 1';
+  WHERE id='.$cat_id;
+  //  LIMIT 1';
   pwg_query($query);
 
   unset( $cache['cat_names'] ); //force regeneration
diff --git a/admin/permalinks.php b/admin/permalinks.php
index b937a8016..bb9dc4934 100644
--- a/admin/permalinks.php
+++ b/admin/permalinks.php
@@ -109,7 +109,7 @@ $template->set_filename('permalinks', 'permalinks.tpl' );
 $query = '
 SELECT
   id,
-  CONCAT(id, " - ", name, IF(permalink IS NULL, "", " √") ) AS name,
+  '.pwg_db_concat(array('id', '\' - \'', 'name', 'IF(permalink IS NULL, \'\', \' √\')')).' AS name,
   uppercats, global_rank
 FROM '.CATEGORIES_TABLE;