[Customisation Database Commits] r704 - in /trunk/titania: common.php contributions/revision.php includes/objects/queue.php install.php language/en/contributions.php styles/default/template/posting/attachments/revisions.html
Tom Catullo
tom at phpbb.com
Sat Mar 6 23:00:19 GMT 2010
Author: Tom
Date: Sat Mar 6 23:00:19 2010
New Revision: 704
Log:
Changed revision_repack column to queue_allow_repack, added new version, and changed template var REPACK to S_REPACK.
Modified:
trunk/titania/common.php
trunk/titania/contributions/revision.php
trunk/titania/includes/objects/queue.php
trunk/titania/install.php
trunk/titania/language/en/contributions.php
trunk/titania/styles/default/template/posting/attachments/revisions.html
Modified: trunk/titania/common.php
==============================================================================
*** trunk/titania/common.php (original)
--- trunk/titania/common.php Sat Mar 6 23:00:19 2010
***************
*** 17,23 ****
}
// Version number (only used for the installer)
! define('TITANIA_VERSION', '0.1.43');
define('PHPBB_MSG_HANDLER', 'titania_msg_handler');
define('PHPBB_USE_BOARD_URL_PATH', true);
--- 17,23 ----
}
// Version number (only used for the installer)
! define('TITANIA_VERSION', '0.1.44');
define('PHPBB_MSG_HANDLER', 'titania_msg_handler');
define('PHPBB_USE_BOARD_URL_PATH', true);
Modified: trunk/titania/contributions/revision.php
==============================================================================
*** trunk/titania/contributions/revision.php (original)
--- trunk/titania/contributions/revision.php Sat Mar 6 23:00:19 2010
***************
*** 52,58 ****
phpbb::$template->assign_vars(array(
'REVISION_NAME' => $old_revision->revision_name,
'REVISION_VERSION' => $old_revision->revision_version,
! 'REPACK' => true,
));
}
--- 52,58 ----
phpbb::$template->assign_vars(array(
'REVISION_NAME' => $old_revision->revision_name,
'REVISION_VERSION' => $old_revision->revision_version,
! 'S_REPACK' => true,
));
}
***************
*** 76,82 ****
$revision_attachment->is_orphan = false;
$revision_attachment->upload(TITANIA_ATTACH_EXT_CONTRIB);
$revision_version = utf8_normalize_nfc(request_var('revision_version', '', true));
! $revision_repack = request_var('revision_repack', 0);
// Check for errors
$error = array_merge($error, $revision_attachment->error);
--- 76,82 ----
$revision_attachment->is_orphan = false;
$revision_attachment->upload(TITANIA_ATTACH_EXT_CONTRIB);
$revision_version = utf8_normalize_nfc(request_var('revision_version', '', true));
! $queue_allow_repack = request_var('queue_allow_repack', 0);
// Check for errors
$error = array_merge($error, $revision_attachment->error);
***************
*** 97,103 ****
'attachment_id' => $revision_attachment->attachment_id,
'revision_name' => utf8_normalize_nfc(request_var('revision_name', '', true)),
'revision_version' => $revision_version,
! 'revision_repack' => $revision_repack,
));
$revision->submit();
$revision_id = $revision->revision_id;
--- 97,103 ----
'attachment_id' => $revision_attachment->attachment_id,
'revision_name' => utf8_normalize_nfc(request_var('revision_name', '', true)),
'revision_version' => $revision_version,
! 'queue_allow_repack' => $queue_allow_repack,
));
$revision->submit();
$revision_id = $revision->revision_id;
Modified: trunk/titania/includes/objects/queue.php
==============================================================================
*** trunk/titania/includes/objects/queue.php (original)
--- trunk/titania/includes/objects/queue.php Sat Mar 6 23:00:19 2010
***************
*** 57,63 ****
'contrib_id' => array('default' => 0),
'submitter_user_id' => array('default' => (int) phpbb::$user->data['user_id']),
'queue_topic_id' => array('default' => 0),
! 'revision_repack' => array('default' => 0),
'queue_type' => array('default' => 0), // contrib type
'queue_status' => array('default' => TITANIA_QUEUE_HIDE), // Uses either TITANIA_QUEUE_NEW or one of the tags for the queue status from the DB
--- 57,63 ----
'contrib_id' => array('default' => 0),
'submitter_user_id' => array('default' => (int) phpbb::$user->data['user_id']),
'queue_topic_id' => array('default' => 0),
! 'queue_allow_repack' => array('default' => 1),
'queue_type' => array('default' => 0), // contrib type
'queue_status' => array('default' => TITANIA_QUEUE_HIDE), // Uses either TITANIA_QUEUE_NEW or one of the tags for the queue status from the DB
Modified: trunk/titania/install.php
==============================================================================
*** trunk/titania/install.php (original)
--- trunk/titania/install.php Sat Mar 6 23:00:19 2010
***************
*** 717,722 ****
--- 717,732 ----
),
),
+ '0.1.44' => array(
+ 'table_column_remove' => array(
+ array(TITANIA_QUEUE_TABLE, 'revision_repack'),
+ ),
+
+ 'table_column_add' => array(
+ array(TITANIA_QUEUE_TABLE, 'queue_allow_repack', array('TINT:1', 1)),
+ ),
+ ),
+
// IF YOU ADD A NEW VERSION DO NOT FORGET TO INCREMENT THE VERSION NUMBER IN common.php!
);
Modified: trunk/titania/language/en/contributions.php
==============================================================================
*** trunk/titania/language/en/contributions.php (original)
--- trunk/titania/language/en/contributions.php Sat Mar 6 23:00:19 2010
***************
*** 114,121 ****
'REVISIONS' => 'Revisions',
'REVISION_NAME' => 'Revision Name',
'REVISION_VERSION' => 'Revision Version',
! 'REVISION_REPACK' => 'Allow Repacking',
! 'REVISION_REPACK_EXPLAIN' => 'Allow this contribution to be repacked for small errors?',
'SELECT_CONTRIB_TYPE' => '-- Select contribution type --',
--- 114,121 ----
'REVISIONS' => 'Revisions',
'REVISION_NAME' => 'Revision Name',
'REVISION_VERSION' => 'Revision Version',
! 'QUEUE_ALLOW_REPACK' => 'Allow Repacking',
! 'QUEUE_ALLOW_REPACK_EXPLAIN' => 'Allow this contribution to be repacked for small errors?',
'SELECT_CONTRIB_TYPE' => '-- Select contribution type --',
Modified: trunk/titania/styles/default/template/posting/attachments/revisions.html
==============================================================================
*** trunk/titania/styles/default/template/posting/attachments/revisions.html (original)
--- trunk/titania/styles/default/template/posting/attachments/revisions.html Sat Mar 6 23:00:19 2010
***************
*** 13,22 ****
<dt><label for="revision_version">{L_REVISION_VERSION}:</label></dt>
<dd><input type="text" name="revision_version" id="revision_version" class="inputbox autowidth" value="{REVISION_VERSION}" /></dd>
</dl>
! <!-- IF not REPACK -->
<dl>
! <dt><label for="revision_repack">{L_REVISION_REPACK}:</label><br /><span>{L_REVISION_REPACK_EXPLAIN}</span></dt>
! <dd><input type="checkbox" id="revision_repack" name="revision_repack" value="1" checked="checked" /></dd>
</dl>
<!-- ENDIF -->
</fieldset>
\ No newline at end of file
--- 13,22 ----
<dt><label for="revision_version">{L_REVISION_VERSION}:</label></dt>
<dd><input type="text" name="revision_version" id="revision_version" class="inputbox autowidth" value="{REVISION_VERSION}" /></dd>
</dl>
! <!-- IF not S_REPACK -->
<dl>
! <dt><label for="queue_allow_repack">{L_QUEUE_ALLOW_REPACK}:</label><br /><span>{L_QUEUE_ALLOW_REPACK_EXPLAIN}</span></dt>
! <dd><input type="checkbox" id="queue_allow_repack" name="queue_allow_repack" value="1" checked="checked" /></dd>
</dl>
<!-- ENDIF -->
</fieldset>
\ No newline at end of file
More information about the customisationdb-commits
mailing list