Index: branches/unlabeled/unlabeled-1.4.2/themes/default/register/register_form.tpl =================================================================== diff -u -r4935 -r7743 --- branches/unlabeled/unlabeled-1.4.2/themes/default/register/register_form.tpl (.../register_form.tpl) (revision 4935) +++ branches/unlabeled/unlabeled-1.4.2/themes/default/register/register_form.tpl (.../register_form.tpl) (revision 7743) @@ -167,6 +167,8 @@ + +
" class="button"> " class="button"> Index: branches/unlabeled/unlabeled-1.30.2/core/units/languages/languages_event_handler.php =================================================================== diff -u -r7649 -r7743 --- branches/unlabeled/unlabeled-1.30.2/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 7649) +++ branches/unlabeled/unlabeled-1.30.2/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 7743) @@ -220,6 +220,7 @@ { $modules = getArrayValue($field_values,'Module'); $lang_xml =& $this->Application->recallObject('LangXML'); + /* @var $lang_xml LangXML_Parser */ $lang_xml->Parse($filename, $field_values['PhraseType'], $modules, $field_values['ImportOverwrite']); $event->redirect = true; Index: branches/unlabeled/unlabeled-1.27.2/core/units/categories/categories_event_handler.php =================================================================== diff -u -r7646 -r7743 --- branches/unlabeled/unlabeled-1.27.2/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 7646) +++ branches/unlabeled/unlabeled-1.27.2/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 7743) @@ -11,6 +11,8 @@ parent::mapPermissions(); $permissions = Array( 'OnRebuildCache' => Array('self' => 'add|edit'), + 'OnPasteClipboard' => Array('self' => 'add|edit'), + 'OnPaste' => array('self'=>'add|edit', 'subitem' => 'edit'), // 'OnSave' => Array('self' => 'add|edit') ); $this->permMapping = array_merge($this->permMapping, $permissions);