1. fixed function populate_a4a() to clean up alternatives from db when no resources...

[acontent.git] / docs / home / editor / editor_tab_functions.inc.php

diff --git a/docs/home/editor/editor_tab_functions.inc.php b/docs/home/editor/editor_tab_functions.inc.php
index f32351c..c7fdda1 100644 (file)
--- a/docs/home/editor/editor_tab_functions.inc.php
+++ b/docs/home/editor/editor_tab_functions.inc.php
@@ -91,12 +91,20 @@ function isValidURL($url) {
  * @return: none
  */
 function populate_a4a($cid, $content, $formatting){
-       global $db, $my_files;
+       global $my_files, $content_base_href, $contentManager;
        
     include_once(TR_INCLUDE_PATH.'classes/A4a/A4a.class.php');
        include_once(TR_INCLUDE_PATH.'classes/XML/XML_HTMLSax/XML_HTMLSax.php');        /* for XML_HTMLSax */
        include_once(TR_INCLUDE_PATH.'classes/ContentOutputParser.class.php');  /* for parser */
        
+       // initialize content_base_href; used in format_content
+       if (!isset($content_base_href)) {
+               $result = $contentManager->getContentPage($cid);
+               // return if the cid is not found
+               if (!($content_row = @mysql_fetch_assoc($result))) return;
+               $content_base_href = $content_row["content_path"].'/';
+       }
+       
        $body = ContentUtility::formatContent($content, $formatting);
     
        $handler = new ContentOutputParser();
@@ -128,23 +136,23 @@ function populate_a4a($cid, $content, $formatting){
                $resources[] = convertAmp($file);  // converts & to &
        }
     
-    if (count($resources) == 0) return;
-
     $a4a = new A4a($cid);
     $db_primary_resources = $a4a->getPrimaryResources();
     
     // clean up the removed resources
     foreach ($db_primary_resources  as $primary_rid=>$db_resource){
         //if this file from our table is not found in the $resource, then it's not used.
-        if(in_array($db_resource['resource'], $resources)===false){
-            $a4a->deletePrimaryResource($primary_rid);
+       if(count($resources) == 0 || !in_array($db_resource['resource'], $resources)){
+               $a4a->deletePrimaryResource($primary_rid);
         }
     }
+    
+    if (count($resources) == 0) return;
 
        // insert the new resources
     foreach($resources as $primary_resource)
        {
-               if (!is_array($a4a->getPrimaryResourceByName($primary_resource))){
+               if (!$a4a->getPrimaryResourceByName($primary_resource)){
                        $a4a->setPrimaryResource($cid, $primary_resource, $_SESSION['lang']);
                }
        }