1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge remote-tracking branch 'remotes/nickv/ticket/10411-2' into develop

# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/10411-2: (33 commits)
  [ticket/10411] Fix call to function on non-object $db->...()
  [ticket/10411] Remove ajax delete, so the page is refreshed
  [ticket/10411] Update schema file with new table and remove the column
  [ticket/10411] Add unit tests for move() with values >1
  [ticket/10411] Add migrations file for teampage table
  [ticket/10411] Revert database_update.php changes from for easier update
  [ticket/10411] Add maxlength to category name input field
  [ticket/10411] Test for thrown exceptions when group does not exist
  [ticket/10411] Catch exceptions from grouppositions
  [ticket/10411] Throw exceptions instead of using trigger_error()
  [ticket/10411] Add return values to add/delete function
  [ticket/10411] Add return value to move functions
  [ticket/10411] Fix typehinting and change private to protected
  [ticket/10411] Use template loops instead of defining the html in php files
  [ticket/10411] Ensure we only get services that do exist
  [ticket/10411] Add a comment why we left join the group table
  [ticket/10411] Rename template variable CUR_ to CURRENT_
  [ticket/10411] Move globals to the top and use array for cache destroy
  [ticket/10411] Use new ajax callback name row_up/row_down
  [ticket/10411] Fix logic error when editing/creating a group
  ...
This commit is contained in:
Nathaniel Guse
2013-03-04 13:25:53 -06:00
26 changed files with 2541 additions and 526 deletions

View File

@@ -620,7 +620,6 @@ CREATE TABLE phpbb_groups (
group_message_limit number(8) DEFAULT '0' NOT NULL,
group_max_recipients number(8) DEFAULT '0' NOT NULL,
group_legend number(8) DEFAULT '0' NOT NULL,
group_teampage number(8) DEFAULT '0' NOT NULL,
CONSTRAINT pk_phpbb_groups PRIMARY KEY (group_id)
)
/
@@ -1541,6 +1540,36 @@ END;
/
/*
Table: 'phpbb_teampage'
*/
CREATE TABLE phpbb_teampage (
teampage_id number(8) NOT NULL,
group_id number(8) DEFAULT '0' NOT NULL,
teampage_name varchar2(765) DEFAULT '' ,
teampage_position number(8) DEFAULT '0' NOT NULL,
teampage_parent number(8) DEFAULT '0' NOT NULL,
CONSTRAINT pk_phpbb_teampage PRIMARY KEY (teampage_id)
)
/
CREATE SEQUENCE phpbb_teampage_seq
/
CREATE OR REPLACE TRIGGER t_phpbb_teampage
BEFORE INSERT ON phpbb_teampage
FOR EACH ROW WHEN (
new.teampage_id IS NULL OR new.teampage_id = 0
)
BEGIN
SELECT phpbb_teampage_seq.nextval
INTO :new.teampage_id
FROM dual;
END;
/
/*
Table: 'phpbb_topics'
*/