Take 2 on last, a=chris

Chris Pollett [2015-01-02 20:Jan:nd]
Take 2 on last, a=chris
Filename
controllers/components/social_component.php
diff --git a/controllers/components/social_component.php b/controllers/components/social_component.php
index 2d109dd56..7633519b6 100644
--- a/controllers/components/social_component.php
+++ b/controllers/components/social_component.php
@@ -801,7 +801,7 @@ class SocialComponent extends Component implements CrawlConstants
                     $id = $group_model->addGroupItem($parent_item["ID"],
                         $group_id, $user_id, $title, $description);
                     $result = $this->handleResourceUploads(
-                            $group_id, "thread".$id);
+                            $group_id, "post".$id);
                     if($result == self::UPLOAD_FAILED) {
                         $parent->redirectWithMessage(
                             tl('social_component_upload_error'));
@@ -921,7 +921,7 @@ class SocialComponent extends Component implements CrawlConstants
                     $thread_id = $group_model->addGroupItem(0,
                         $group_id, $user_id, $title, $description);
                     $result = $this->handleResourceUploads(
-                            $group_id, "thread".$thread_id);
+                            $group_id, "post".$thread_id);
                     if($result == self::UPLOAD_FAILED) {
                         $parent->redirectWithMessage(
                             tl('social_component_upload_error'));
@@ -995,7 +995,7 @@ class SocialComponent extends Component implements CrawlConstants
                     $group_model->updateGroupItem($post_id, $title,
                         $description);
                     $result = $this->handleResourceUploads(
-                        $group_id, "thread".$post_id);
+                        $group_id, "post".$post_id);
                     if($result == self::UPLOAD_FAILED) {
                         $parent->redirectWithMessage(
                             tl('social_component_upload_error'));
@@ -1149,7 +1149,7 @@ class SocialComponent extends Component implements CrawlConstants
             $page[self::DESCRIPTION] = $parser->parse($description);
             $page[self::DESCRIPTION] =
                 $group_model->insertResourcesParsePage($item['GROUP_ID'],
-                 "thread".$item['ID'],
+                 "post".$item['ID'],
                 $locale_tag, $page[self::DESCRIPTION]);
             if(!$math && strpos($page[self::DESCRIPTION], "`") !== false) {
                 $math = true;
@@ -1229,8 +1229,11 @@ class SocialComponent extends Component implements CrawlConstants
         return $data;
     }
     /**
+     * Used to handle file uploads either to message posts or wiki pages
      *
-     *
+     * @param string $group_id the group the message or wiki page is associated
+     *      with
+     * @param string $store_id the id of the message post or wiki page
      */
     function handleResourceUploads($group_id, $store_id)
     {
@@ -1647,6 +1650,13 @@ EOD;
                         $result = $this->handleResourceUploads(
                             $group_id, $page_info['ID']);
                         if($result == self::UPLOAD_SUCCESS) {
+                            //we re-parse page so resources parsed
+                            $group_model->setPageName($user_id,
+                                $group_id, $page_name, $page,
+                                $locale_tag, $edit_reason,
+                                tl('group_controller_page_created', $page_name),
+                                tl('group_controller_page_discuss_here'),
+                                $read_address, $additional_substitutions);
                             $parent->redirectWithMessage(
                                 tl('social_component_resource_uploaded'),
                                 array('arg', 'page_name', 'settings',
ViewGit