goba            Thu Sep  2 18:03:15 2004 EDT

  Modified files:              
    /phpdoc/scripts     file-entities.php.in 
  Log:
  no functions directory exists anymore
  
http://cvs.php.net/diff.php/phpdoc/scripts/file-entities.php.in?r1=1.19&r2=1.20&ty=u
Index: phpdoc/scripts/file-entities.php.in
diff -u phpdoc/scripts/file-entities.php.in:1.19 
phpdoc/scripts/file-entities.php.in:1.20
--- phpdoc/scripts/file-entities.php.in:1.19    Thu Sep  2 17:20:26 2004
+++ phpdoc/scripts/file-entities.php.in Thu Sep  2 18:03:13 2004
@@ -17,7 +17,7 @@
   |             Gabor Hojtsy <[EMAIL PROTECTED]>                              |
   +----------------------------------------------------------------------+
   
-  $Id: file-entities.php.in,v 1.19 2004/09/02 21:20:26 goba Exp $
+  $Id: file-entities.php.in,v 1.20 2004/09/02 22:03:13 goba Exp $
 */
 
 /**
@@ -170,13 +170,6 @@
  */
 function file_entities($work_dir, $trans_dir, $orig_dir, &$entities) {
 
-    // Skip the function directory not under "reference". That
-    // folder is only kept for backward compatibility and only
-    // in the English version of the docs.
-    if (strpos($work_dir, "functions") && !preg_match("!reference/.*/functions!", 
$work_dir)) {
-        return;
-    }
-    
     // Compute translated version's path
     $trans_path = str_replace($orig_dir, $trans_dir, $work_dir);
     
@@ -227,21 +220,6 @@
                 $function_entities[] = "&$name;";
             }
             
-            // Special treatment for function reference entities if splitted version 
available
-            if (strstr($work_dir,"/functions")) {
-                $splitfile = str_replace(".xml", "/reference.xml", $file);
-                $splitpath = str_replace("/functions", "/reference", $trans_path) . 
"/" . $splitfile;
-                if (file_exists($splitpath)) {
-                  $entities[] = entstr($name, $splitpath);
-                  continue;
-                } 
-                $splitpath = str_replace("/functions", "/reference", $trans_path) . 
"/" . $splitfile;
-                if (file_exists($splitpath)) {
-                  $entities[] = entstr($name, $splitpath);
-                  continue;
-                } 
-            }
-  
             // If we have a translated file, use it, otherwise fall back to English
             if (file_exists("$trans_path/$file")) {
                 $path = "$trans_path/$file";

Reply via email to