merge r3054 from branch 2.0 to trunk

Code administration: convert all text files to Unix file format (CR as eol
and not CRLF)


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

3 files changed, 28 insertions, 28 deletions

diff --git a/install/db/33-database.php b/install/db/33-database.php
index 2a972f92f..4efd0f9ed 100644
--- a/install/db/33-database.php
+++ b/install/db/33-database.php
@@ -26,7 +26,7 @@ if (!defined('PHPWG_ROOT_PATH'))
   die('Hacking attempt!');
 }
 
-$upgrade_description = 'Add column #group.is_default';

+$upgrade_description = 'Add column #group.is_default';
 
 include_once(PHPWG_ROOT_PATH.'include/constants.php');
 
@@ -35,12 +35,12 @@ include_once(PHPWG_ROOT_PATH.'include/constants.php');
 // +-----------------------------------------------------------------------+
 
 echo "Add column is_default on ".GROUPS_TABLE;
-$query = '

-alter table '.GROUPS_TABLE.' add column 

-`is_default` enum(\'true\',\'false\') NOT NULL default \'false\'

-;';

-pwg_query($query);

-

+$query = '
+alter table '.GROUPS_TABLE.' add column 
+`is_default` enum(\'true\',\'false\') NOT NULL default \'false\'
+;';
+pwg_query($query);
+
 
 echo
 "\n"
diff --git a/install/db/37-database.php b/install/db/37-database.php
index 1fde4ccf9..f58d555ff 100644
--- a/install/db/37-database.php
+++ b/install/db/37-database.php
@@ -26,7 +26,7 @@ if (!defined('PHPWG_ROOT_PATH'))
   die('Hacking attempt!');
 }
 
-$upgrade_description = 'Cache user categories update';

+$upgrade_description = 'Cache user categories update';
 
 include_once(PHPWG_ROOT_PATH.'include/constants.php');
 
@@ -34,25 +34,25 @@ include_once(PHPWG_ROOT_PATH.'include/constants.php');
 // |                            Upgrade content                            |
 // +-----------------------------------------------------------------------+
 
-echo "Create table ".USER_CACHE_CATEGORIES_TABLE;

-$query = '

-CREATE TABLE '.USER_CACHE_CATEGORIES_TABLE.' (

-  `user_id` smallint(5) NOT NULL default \'0\',

-  `cat_id` smallint(5) unsigned NOT NULL default \'0\',

-  `is_child_date_last` enum(\'true\',\'false\') NOT NULL default \'false\',

-  `max_date_last` datetime default NULL,

-  `count_images` mediumint(8) unsigned default 0,

-  `count_categories` mediumint(8) unsigned default 0,

-  PRIMARY KEY  (`user_id`, `cat_id`)

-) TYPE=MyISAM;';

-pwg_query($query);

-

-echo "Update table cache ".USER_CACHE_TABLE;

-$query = '

-UPDATE '.USER_CACHE_TABLE.'

-  SET need_update = \'true\'

-;';

-pwg_query($query);

+echo "Create table ".USER_CACHE_CATEGORIES_TABLE;
+$query = '
+CREATE TABLE '.USER_CACHE_CATEGORIES_TABLE.' (
+  `user_id` smallint(5) NOT NULL default \'0\',
+  `cat_id` smallint(5) unsigned NOT NULL default \'0\',
+  `is_child_date_last` enum(\'true\',\'false\') NOT NULL default \'false\',
+  `max_date_last` datetime default NULL,
+  `count_images` mediumint(8) unsigned default 0,
+  `count_categories` mediumint(8) unsigned default 0,
+  PRIMARY KEY  (`user_id`, `cat_id`)
+) TYPE=MyISAM;';
+pwg_query($query);
+
+echo "Update table cache ".USER_CACHE_TABLE;
+$query = '
+UPDATE '.USER_CACHE_TABLE.'
+  SET need_update = \'true\'
+;';
+pwg_query($query);
 
 echo
 "\n"
diff --git a/install/db/61-database.php b/install/db/61-database.php
index 84a6dc886..491843d05 100644
--- a/install/db/61-database.php
+++ b/install/db/61-database.php
@@ -37,7 +37,7 @@ include_once(PHPWG_ROOT_PATH.'include/constants.php');
 
 $query = "
 alter table ".GROUPS_TABLE."
-  add UNIQUE KEY `groups_ui1` (`name`)

+  add UNIQUE KEY `groups_ui1` (`name`)
 ;";
 pwg_query($query);