Changeset 1671
- Timestamp:
- 1/25/2010 5:18:41 AM (3 years ago)
- File:
-
- 1 edited
-
trunk/website/scripts/blackbox/upload.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/website/scripts/blackbox/upload.php
r1646 r1671 9 9 { 10 10 $matches = array(); 11 if (preg_match('/^( ^[ ]+) (.*) (^[ ]+) (.*):(^[]+) ([0-9]+)/', $line, $matches))11 if (preg_match('/^([^ ]+) (.*) ([^ ]+) (.*):([^ ]+) ([0-9]+)/', $line, $matches)) 12 12 { 13 13 } 14 else if (preg_match('/^( ^[]+) (.*)/', $line, $matches))14 else if (preg_match('/^([^ ]+) (.*)/', $line, $matches)) 15 15 { 16 16 } 17 17 18 return $matches[ 1];18 return $matches[2]; 19 19 } 20 20 … … 83 83 $matches = array(); 84 84 $function = $file = $line = null; 85 if (preg_match('/^ at (.*) in (.*):line([0-9]+)/', $stackFrame, $matches))85 if (preg_match('/^([^ ]+) (.*) ([^ ]+) (.*):([^ ]+) ([0-9]+)/', $stackFrame, $matches)) 86 86 { 87 87 $function = $matches[1]; … … 89 89 $line = intval($matches[3]); 90 90 } 91 else if (preg_match('/^ at(.*)/', $stackFrame, $matches))91 else if (preg_match('/^([^ ]+) (.*)/', $stackFrame, $matches)) 92 92 { 93 93 $function = $matches[1];
Note: See TracChangeset
for help on using the changeset viewer.
