Changeset 1589 for trunk

Timestamp:

Nov 1, 2006, 6:04:24 AM (18 years ago)

Author:

rvelices

Message:

fix: get_filename_wo_extension (check for ===false) and template make_filename
improvement: can retrieve template output outside the template

Location:

trunk/include

Files:

• functions.inc.php (modified) (1 diff)
• template.php (modified) (3 diffs)

trunk/include/functions.inc.php

@@ -185 +185 @@
 function get_filename_wo_extension( $filename )
 {
-  return substr( $filename, 0, strrpos( $filename, '.' ) );
+  $pos = strrpos( $filename, '.' );
+  return ($pos===false) ? $filename : substr( $filename, 0, $pos);
 }
 

trunk/include/template.php

@@ -148 +148 @@
 
   /**
-   * fills $output template var
-   */
-  function parse($handle)
+   * fills $output template var by default or returns the content
+   */
+  function parse($handle, $return=false)
     {
       if (!$this->loadfile($handle))
@@ -167 +167 @@
       $_str = '';
       eval($this->compiled_code[$handle]);
+      if ($return)
+      {
+        return $_str;
+      }
       $this->output.= $_str;
 
@@ -303 +307 @@
     {
       // Check if it's an absolute or relative path.
-      if (substr($filename, 0, 1) != '/'
-          and substr($filename, 0, 1) != '\\' //Windows UNC path
-          and !preg_match('/^[a-z]:\\\/i', $filename) )
+      // if (substr($filename, 0, 1) != '/')
+      if (preg_match('/^[a-z_][^:]/i', $filename) )
       {
         $filename = $this->root.'/'.$filename;