aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--install/config.sql4
-rw-r--r--install/db/137-database.php62
2 files changed, 64 insertions, 2 deletions
diff --git a/install/config.sql b/install/config.sql
index ff045fc07..eba9c60ff 100644
--- a/install/config.sql
+++ b/install/config.sql
@@ -56,8 +56,8 @@ INSERT INTO piwigo_config (param,value,comment)
);
INSERT INTO piwigo_config (param,value,comment) VALUES ('week_starts_on','monday','Monday may not be the first day of the week');
INSERT INTO piwigo_config (param,value,comment) VALUES ('updates_ignored','a:3:{s:7:"plugins";a:0:{}s:6:"themes";a:0:{}s:9:"languages";a:0:{}}','Extensions ignored for update');
-INSERT INTO piwigo_config (param,value,comment) VALUES ('order_by','ORDER BY date_available DESC,file,id','default photo order');
-INSERT INTO piwigo_config (param,value,comment) VALUES ('order_by_inside_category','ORDER BY date_available DESC,file,id','default photo order inside category');
+INSERT INTO piwigo_config (param,value,comment) VALUES ('order_by','ORDER BY date_available DESC, file ASC, id ASC','default photo order');
+INSERT INTO piwigo_config (param,value,comment) VALUES ('order_by_inside_category','ORDER BY date_available DESC, file ASC, id ASC','default photo order inside category');
INSERT INTO piwigo_config (param,value) VALUES ('original_resize','false');
INSERT INTO piwigo_config (param,value) VALUES ('original_resize_maxwidth','2016');
INSERT INTO piwigo_config (param,value) VALUES ('original_resize_maxheight','2016');
diff --git a/install/db/137-database.php b/install/db/137-database.php
new file mode 100644
index 000000000..b6299cfd0
--- /dev/null
+++ b/install/db/137-database.php
@@ -0,0 +1,62 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2013 Piwigo Team http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+defined('PHPWG_ROOT_PATH') or die('Hacking attempt!');
+
+$upgrade_description = 'add ASC keyword to categories image_order field';
+
+
+$query = '
+SELECT id, image_order
+ FROM '.CATEGORIES_TABLE.'
+ WHERE image_order != ""
+;';
+$cats = hash_from_query($query, 'id');
+
+foreach ($cats as $id => &$data)
+{
+ $image_order = explode(',',$data['image_order']);
+ foreach ($image_order as &$order)
+ {
+ if (strpos($order, ' ASC')===false && strpos($order, ' DESC')===false)
+ {
+ $order.= ' ASC';
+ }
+ }
+ unset($order);
+ $data['image_order'] = implode(',',$image_order);
+}
+unset($data);
+
+mass_updates(CATEGORIES_TABLE,
+ array(
+ 'primary' => array('id'),
+ 'update' => array('image_order'),
+ ),
+ $cats
+ );
+
+
+echo "\n".$upgrade_description."\n";
+
+?> \ No newline at end of file