Changeset 4134

Show
Ignore:
Timestamp:
Tue Dec 6 22:43:38 2005
Author:
paul
Message:

Fixed bug where article attachments were not preserved when the article was copied.

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/campsite/implementation/management/priv/articles/do_article_list_action.php

    r4101 r4134  
    10 10  
    11 11  
    12   echo "<pre>";  
    13   print_r($_REQUEST);  
    14   echo "</pre>";  
      12 //echo "<pre>";  
      13 //print_r($_REQUEST);  
      14 //echo "</pre>";  
    15 15  
    16 16 // Get input  

  • trunk/campsite/implementation/management/priv/articles/index.php

    r4133 r4134  
    240 240                  
    241 241                 <?php  if ($User->hasPermission('AddArticle')) { ?>  
    242                   <OPTION value="copy"><?php putGS("Copy"); ?></OPTION>  
    243                   <OPTION value="copy_interactive"><?php putGS("Copy to another section"); ?></OPTION>  
      242                 <OPTION value="copy"><?php putGS("Duplicate"); ?></OPTION>  
      243                 <OPTION value="copy_interactive"><?php putGS("Duplicate to another section"); ?></OPTION>  
    244 244                 <OPTION value="translate"><?php putGS("Translate"); ?></OPTION>  
    245 245                 <?php } ?>  

  • trunk/campsite/implementation/management/priv/articles/edit.php

    r4129 r4134  
    232 232                          
    233 233                         <?php  if ($User->hasPermission('AddArticle')) { ?>  
    234                           <OPTION value="copy"><?php putGS("Copy"); ?></OPTION>  
      234                         <OPTION value="copy"><?php putGS("Duplicate"); ?></OPTION>  
    234 234                         <OPTION value="translate"><?php putGS("Translate"); ?></OPTION>  
    235 235                         <?php } ?>               

  • trunk/campsite/implementation/management/classes/ArticleAttachment.php

    r4133 r4134  
    152 152     {  
    153 153         global $Campsite;  
    154           $queryStr = 'SELECT fk_attachment_id FROM ArticleAttachments WHERE fk_article_id='.$p_srcArticleNumber;  
      154         $queryStr = 'SELECT fk_attachment_id FROM ArticleAttachments WHERE fk_article_number='.$p_srcArticleNumber;  
    154 154         $rows = $Campsite['db']->GetAll($queryStr);  
    155 155         foreach ($rows as $row) {  

  • trunk/campsite/implementation/management/classes/Article.php

    r4133 r4134  
    20 20 require_once($g_documentRoot.'/classes/ArticleTopic.php');  
    21 21 require_once($g_documentRoot.'/classes/ArticleIndex.php');  
      22 require_once($g_documentRoot.'/classes/ArticleAttachment.php');  
    22 23 require_once($g_documentRoot.'/classes/Language.php');  
    23 24 require_once($g_documentRoot.'/classes/Log.php');  
    284 285             ArticleTopic::OnArticleCopy($copyMe->m_data['Number'], $articleCopy->m_data['Number']);  
    285 286              
      287             // Copy file pointers  
      288             ArticleAttachment::OnArticleCopy($copyMe->m_data['Number'], $articleCopy->m_data['Number']);  
      289              
    286 290             // Position the new article at the beginning of the section  
    287 291             $articleCopy->moveAbsolute(1);