From cd30335df7f2a4c3b15c5f2ba181dc1b0444f00a Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Sun, 20 Apr 2008 22:25:40 +0000
Subject: merge r 2306 from trunk to branch-1_7 - merged function ordering()
 with update_global_rank() and also optimized the queries

git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2307 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 install/upgrade_1.3.1.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'install/upgrade_1.3.1.php')

diff --git a/install/upgrade_1.3.1.php b/install/upgrade_1.3.1.php
index aa2421eba..e27e3ad40 100644
--- a/install/upgrade_1.3.1.php
+++ b/install/upgrade_1.3.1.php
@@ -71,7 +71,7 @@ ALTER TABLE phpwebgallery_categories
 ALTER TABLE phpwebgallery_categories
   ADD COLUMN commentable enum('true','false') NOT NULL default 'true'
 ;",
-  
+
   "
 ALTER TABLE phpwebgallery_categories
   ADD COLUMN global_rank varchar(255) default NULL
@@ -91,7 +91,7 @@ ALTER TABLE phpwebgallery_comments
 UPDATE phpwebgallery_comments
   SET date_temp = date
 ;",
-  
+
   "
 ALTER TABLE phpwebgallery_comments
   CHANGE COLUMN date date datetime NOT NULL default '0000-00-00 00:00:00'
@@ -126,7 +126,7 @@ ALTER TABLE phpwebgallery_history
 UPDATE phpwebgallery_history
   SET date_temp = date
 ;",
-  
+
   "
 ALTER TABLE phpwebgallery_history
   CHANGE COLUMN date date datetime NOT NULL default '0000-00-00 00:00:00'
@@ -207,7 +207,7 @@ ALTER TABLE phpwebgallery_images
 ALTER TABLE phpwebgallery_images
   ADD INDEX images_i5 (date_creation)
 ;",
-  
+
   "
 ALTER TABLE phpwebgallery_sessions
   DROP COLUMN ip
@@ -222,7 +222,7 @@ ALTER TABLE phpwebgallery_sessions
 UPDATE phpwebgallery_sessions
   SET expiration_temp = expiration
 ;",
-  
+
   "
 ALTER TABLE phpwebgallery_sessions
   CHANGE COLUMN expiration expiration datetime NOT NULL default '0000-00-00 00:00:00'
@@ -237,7 +237,7 @@ UPDATE phpwebgallery_sessions
 ALTER TABLE phpwebgallery_sessions
   DROP COLUMN expiration_temp
 ;",
-  
+
   "
 ALTER TABLE phpwebgallery_sites
   DROP INDEX galleries_url
@@ -251,7 +251,7 @@ ALTER TABLE phpwebgallery_sites
   "
 DROP TABLE phpwebgallery_user_category
 ;",
-  
+
   "
 ALTER TABLE phpwebgallery_users
   DROP COLUMN long_period
@@ -276,7 +276,7 @@ ALTER TABLE phpwebgallery_users
 ALTER TABLE phpwebgallery_users
   ADD UNIQUE users_ui1 (username)
 ;",
-  
+
   "
 CREATE TABLE phpwebgallery_rate (
   user_id smallint(5) unsigned NOT NULL default '0',
@@ -342,7 +342,7 @@ $indexes_of = array(
 foreach (array_keys($indexes_of) as $table)
 {
   $existing_indexes = array();
-  
+
   $query = '
 SHOW INDEX
   FROM '.PREFIX_TABLE.$table.'
@@ -529,7 +529,6 @@ mass_inserts(
   );
 
 // refresh calculated datas
-ordering();
 update_global_rank();
 update_category();
 
@@ -587,7 +586,7 @@ $page['infos'] = array_merge(
   $page['infos'],
   array(
     'all sub-categories of private categories become private',
-    
+
     'user permissions and group permissions have been erased',
 
     'only thumbnails prefix and webmaster mail address have been saved from
-- 
cgit v1.2.3