template: Fixed undefined $from_internal in assign_bool(); theme.cfg now require()d on theme load
--- a/includes/template.php Fri Dec 19 21:27:51 2008 -0500
+++ b/includes/template.php Fri Dec 19 21:29:17 2008 -0500
@@ -434,6 +434,8 @@
'style' => $this->style
);
+ require(ENANO_ROOT . "/themes/{$this->theme}/theme.cfg");
+
if ( $local_page_exists && isset($paths->pages[$local_page]) )
{
$local_cdata =& $paths->pages[$local_page];
@@ -1421,7 +1423,7 @@
* @param $from_internal bool Internal switch, just omit (@todo document)
*/
- function assign_bool($vars)
+ function assign_bool($vars, $from_internal = false)
{
foreach ( $vars as $key => $value )
{
@@ -1744,7 +1746,7 @@
(
(?:https?|ftp|irc):\/\/ # protocol
(?:[^@\s\]"\':]+@)? # username (FTP only but whatever)
- (?:(?:(?:[a-z0-9-]+\.)*)[a-z0-9\[\]:]+) # hostname
+ (?:(?:(?:[a-z0-9-]+\.)*)[a-z0-9\[\]:]+) # hostname
(?::[0-9]+)? # port number
(?:\/[A-z0-9_%\|~`!\!@#\$\^&?=\*\(\):;\.,\/-]*)? # path
)