Changeset 4938
- Timestamp:
- 08/30/07 11:34:39 (2 years ago)
- Files:
-
- trunk/data/data/error_messages.yml (deleted)
- trunk/data/data/exception.php (modified) (1 diff)
- trunk/lib/config/sfPhpConfigHandler.class.php (modified) (2 diffs)
- trunk/lib/exception/sfException.class.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/data/data/exception.php
r4550 r4938 35 35 <h1>[<?php echo $name ?>]</h1> 36 36 <h2 id="message"><?php echo $message ?></h2> 37 <?php if ($error_reference): ?>38 <p class="error"><a href='http://www.symfony-project.com/errors/<?php echo $error_reference ?>'>learn more about this issue</a></p>39 <?php endif; ?>40 37 <h2>stack trace</h2> 41 38 <ul><li><?php echo implode('</li><li>', $traces) ?></li></ul> trunk/lib/config/sfPhpConfigHandler.class.php
r4845 r4938 79 79 if (!array_key_exists($key, $configs)) 80 80 { 81 throw new sfParseException(sprintf('Configuration file "%s" specifies key "%s" which is not a php.ini directive [err0002].', $configFiles[0], $key));81 throw new sfParseException(sprintf('Configuration file "%s" specifies key "%s" which is not a php.ini directive.', $configFiles[0], $key)); 82 82 } 83 83 84 84 if (ini_get($key) != $value) 85 85 { 86 throw new sfInitializationException(sprintf('Configuration file "%s" specifies that php.ini "%s" key must be set to "%s". The current value is "%s" (%s). [err0001].', $configFiles[0], $key, var_export($value, true), var_export(ini_get($key), true), $this->get_ini_path()));86 throw new sfInitializationException(sprintf('Configuration file "%s" specifies that php.ini "%s" key must be set to "%s". The current value is "%s" (%s).', $configFiles[0], $key, var_export($value, true), var_export(ini_get($key), true), $this->get_ini_path())); 87 87 } 88 88 } … … 99 99 if (!array_key_exists($key, $configs)) 100 100 { 101 throw new sfParseException(sprintf('Configuration file "%s" specifies key "%s" which is not a php.ini directive [err0002].', $configFiles[0], $key));101 throw new sfParseException(sprintf('Configuration file "%s" specifies key "%s" which is not a php.ini directive.', $configFiles[0], $key)); 102 102 } 103 103 trunk/lib/exception/sfException.class.php
r4839 r4938 113 113 $format = 0 == strncasecmp(PHP_SAPI, 'cli', 3) ? 'plain' : 'html'; 114 114 $traces = $this->getTraces($exception, $format); 115 116 // extract error reference from message117 $error_reference = '';118 if (preg_match('/\[(err\d+)\]/', $message, $matches))119 {120 $error_reference = $matches[1];121 }122 115 123 116 // dump main objects values
