[textpattern commit] r2972 - development/4.0/textpattern/lib

[codesite...@google.com]

Author: ru...@vanmelick.com
Date: Sun Sep 14 11:43:28 2008
New Revision: 2972

Modified:
development/4.0/textpattern/lib/txplib_misc.php

Log:
assert_int aborts script execution instead of just warning

Modified: development/4.0/textpattern/lib/txplib_misc.php
==============================================================================
--- development/4.0/textpattern/lib/txplib_misc.php (original)
+++ development/4.0/textpattern/lib/txplib_misc.php Sun Sep 14 11:43:28 2008
@@ -2114,11 +2114,17 @@
return (int) $myvar;
}

- if (($production_status == 'debug') || (txpinterface == 'admin')) {
+ if (($production_status == 'debug') || (txpinterface == 'admin'))
+ {
trigger_error("<pre>Error: '".htmlspecialchars($myvar)."' is not an
integer</pre>".
- "\n".'<pre style="padding-left: 2em;" class="backtrace"><code>'.
- htmlspecialchars(join("\n", get_caller(5,1))).'</code></pre>',
E_USER_WARNING);
- } else trigger_error("'".htmlspecialchars($myvar)."' is not an
integer.", E_USER_WARNING);
+ n.'<pre style="padding-left: 2em;" class="backtrace"><code>'.
+ htmlspecialchars(join(n, get_caller(5,1))).'</code></pre>',
E_USER_ERROR);
+ }
+ else
+ {
+ trigger_error("'".htmlspecialchars($myvar)."' is not an integer.",
E_USER_ERROR);
+ }
+
return false;
}