Changeset 1178

Timestamp:

07/04/2008 10:12:57 PM (5 years ago)

Author:

BrianKoontz

Message:

Added arg to arglist to return an error status. Refs #792.

Files:

• trunk/libs/Wakka.class.php (modified) (3 diffs)

trunk/libs/Wakka.class.php

@@ -561 +561 @@
          * @param       boolean $makepage       optional: create a "page" div for error; default FALSE
          * @param       string  $vars   optional: vars to be passed to the file to handle. default: ''
+         * @param   boolean  $err    optional: error flag indicating whether or not an error message was returned
          * @return      string  the included file's output or the $not_found_text if the file could not be found
          */
-        function IncludeBuffered($filename, $path, $not_found_text, $makepage=FALSE, $vars='')
+        function IncludeBuffered($filename, $path, $not_found_text, $makepage=FALSE, $vars='', &$err='')
         {
 #echo 'IncludeBuffered - filename specified: '.$filename."<br/>\n";
@@ -583 +584 @@
                                 extract($vars, EXTR_SKIP);      // [SEC] EXTR_SKIP avoids collision with existing filenames
                         }
+                        $err = false;
                         ob_start();
                         include $fullfilepath;                  // this is where it all happens!
@@ -593 +595 @@
                         $output = ($makepage) ? '<div class="page"><em class="error">'.$not_found_text.'</em></div>' : '<em class="error">'.$not_found_text.'</em>';
                 }
+                $err = true;
                 return $output;
         }