Author: snoopdave Date: Fri May 18 19:58:13 2007 New Revision: 539680 URL: http://svn.apache.org/viewvc?view=rev&rev=539680 Log: Merging createdb.sql fixes from trunk
Modified: roller/branches/roller_4.0_newbackend/merges.txt roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm Modified: roller/branches/roller_4.0_newbackend/merges.txt URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/merges.txt?view=diff&rev=539680&r1=539679&r2=539680 ============================================================================== --- roller/branches/roller_4.0_newbackend/merges.txt (original) +++ roller/branches/roller_4.0_newbackend/merges.txt Fri May 18 19:58:13 2007 @@ -4,6 +4,7 @@ Temporary file to track merges from trunk into the roller_4.0_newbackend branch. May 18, 2007: merging latest from trunk +svn merge -r 539671:539679 https://svn.apache.org/repos/asf/roller/trunk svn merge -r 539636:539671 https://svn.apache.org/repos/asf/roller/trunk svn merge -r 539068:539636 https://svn.apache.org/repos/asf/roller/trunk Modified: roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm?view=diff&rev=539680&r1=539679&r2=539680 ============================================================================== --- roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm (original) +++ roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm Fri May 18 19:58:13 2007 @@ -120,7 +120,10 @@ pagemodels varchar(255) default null, enablemultilang $db.BOOLEAN_SQL_TYPE_FALSE not null, showalllangs $db.BOOLEAN_SQL_TYPE_TRUE not null, - customstylesheet varchar(128) + customstylesheet varchar(128), + about varchar(255), + icon varchar(255) + ); create index ws_userid_idx on website(userid); create index ws_isenabled_idx on website(isenabled);