mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-27 11:49:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

bug 2794: Virtual albums are displayed in physical albums list in synchronization tool

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@19548 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2012-12-24 10:16:33 +00:00
parent 7a7b1f259a
commit b6328fcb70
2 changed files with 36 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

35
install/db/133-database.php Normal file
View file

@ -0,0 +1,35 @@
<?php
// +-----------------------------------------------------------------------+
// | Piwigo - a PHP based photo gallery |
// +-----------------------------------------------------------------------+
// | Copyright(C) 2008-2012 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 = '#categories.site_id default value.';
$query = 'ALTER TABLE '.CATEGORIES_TABLE.' CHANGE site_id site_id tinyint(4) unsigned default NULL';
pwg_query($query);
$query = 'UPDATE '.CATEGORIES_TABLE.' SET site_id=NULL WHERE dir IS NULL';
pwg_query($query);
echo "\n".$upgrade_description."\n";
?>

2
install/piwigo_structure-mysql.sql
View file

@ -28,7 +28,7 @@ CREATE TABLE `piwigo_categories` (
`dir` varchar(255) default NULL,
`rank` smallint(5) unsigned default NULL,
`status` enum('public','private') NOT NULL default 'public',
`site_id` tinyint(4) unsigned default '1',
`site_id` tinyint(4) unsigned default NULL,
`visible` enum('true','false') NOT NULL default 'true',
`representative_picture_id` mediumint(8) unsigned default NULL,
`uppercats` varchar(255) NOT NULL default '',