diff options
| author | patdenice <patdenice@piwigo.org> | 2010-12-14 14:36:20 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2010-12-14 14:36:20 +0000 |
| commit | e97974a42e64ee43d95cef258d65d9b022929dbe (patch) | |
| tree | 00cef9ee9212ae653a8e266a2db51ad3dbe6c39b /install | |
| parent | 21fe811c3b773af20a9e9d9932274cae16111cb1 (diff) | |
feature 2060: Remove adviser from db structure.
Remove adviser from user_list page and some db queries.
git-svn-id: http://piwigo.org/svn/trunk@8131 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | install/db/91-database.php | 2 | ||||
| -rw-r--r-- | install/piwigo_structure-mysql.sql | 1 | ||||
| -rw-r--r-- | install/piwigo_structure-pdo-sqlite.sql | 1 | ||||
| -rw-r--r-- | install/piwigo_structure-pgsql.sql | 1 | ||||
| -rw-r--r-- | install/piwigo_structure-sqlite.sql | 1 |
5 files changed, 1 insertions, 5 deletions
diff --git a/install/db/91-database.php b/install/db/91-database.php index 871db559e..1f551c517 100644 --- a/install/db/91-database.php +++ b/install/db/91-database.php @@ -32,7 +32,7 @@ $upgrade_description = 'Remove adviser status.'; $query = " UPDATE ".USER_INFOS_TABLE." SET status = 'normal' -WHERE (status = 'webmaster' OR status = 'admin') +WHERE status IN ('webmaster', 'admin') AND adviser = 'true' ;"; diff --git a/install/piwigo_structure-mysql.sql b/install/piwigo_structure-mysql.sql index e9f0eb0dc..44124f072 100644 --- a/install/piwigo_structure-mysql.sql +++ b/install/piwigo_structure-mysql.sql @@ -404,7 +404,6 @@ CREATE TABLE `piwigo_user_infos` ( `nb_image_line` tinyint(1) unsigned NOT NULL default '5', `nb_line_page` tinyint(3) unsigned NOT NULL default '3', `status` enum('webmaster','admin','normal','generic','guest') NOT NULL default 'guest', - `adviser` enum('true','false') NOT NULL default 'false', `language` varchar(50) NOT NULL default 'en_UK', `maxwidth` smallint(6) default NULL, `maxheight` smallint(6) default NULL, diff --git a/install/piwigo_structure-pdo-sqlite.sql b/install/piwigo_structure-pdo-sqlite.sql index ac90d3e9f..e4aa71ca3 100644 --- a/install/piwigo_structure-pdo-sqlite.sql +++ b/install/piwigo_structure-pdo-sqlite.sql @@ -467,7 +467,6 @@ CREATE TABLE piwigo_user_infos "nb_image_line" INTEGER default 5 NOT NULL, "nb_line_page" INTEGER default 3 NOT NULL, "status" VARCHAR(50) default 'guest', - "adviser" BOOLEAN default false, "language" VARCHAR(50) default 'en_UK' NOT NULL, "maxwidth" INTEGER, "maxheight" INTEGER, diff --git a/install/piwigo_structure-pgsql.sql b/install/piwigo_structure-pgsql.sql index 719497ba7..f4679cc83 100644 --- a/install/piwigo_structure-pgsql.sql +++ b/install/piwigo_structure-pgsql.sql @@ -568,7 +568,6 @@ CREATE TABLE "piwigo_user_infos" "nb_image_line" INTEGER default 5 NOT NULL, "nb_line_page" INTEGER default 3 NOT NULL, "status" USER_INFOS_STATUS default 'guest'::USER_INFOS_STATUS, - "adviser" BOOLEAN default false, "language" VARCHAR(50) default 'en_UK' NOT NULL, "maxwidth" INTEGER, "maxheight" INTEGER, diff --git a/install/piwigo_structure-sqlite.sql b/install/piwigo_structure-sqlite.sql index ac90d3e9f..e4aa71ca3 100644 --- a/install/piwigo_structure-sqlite.sql +++ b/install/piwigo_structure-sqlite.sql @@ -467,7 +467,6 @@ CREATE TABLE piwigo_user_infos "nb_image_line" INTEGER default 5 NOT NULL, "nb_line_page" INTEGER default 3 NOT NULL, "status" VARCHAR(50) default 'guest', - "adviser" BOOLEAN default false, "language" VARCHAR(50) default 'en_UK' NOT NULL, "maxwidth" INTEGER, "maxheight" INTEGER, |