@@ -675,6 +675,7 @@ a.prev_page:hover { } button:active, .button:active, +.button.selected, a.next_page:active, a.prev_page:active { background-color: #d7d7d7; admin/themes/default/style.css @@ -71,15 +71,16 @@ $this->method = "mysqli"; elseif ($this->adapter == "mysql" and function_exists("mysql_connect")) $this->method = "mysql"; - elseif ($this->adapter == "sqlite" and in_array("sqlite", PDO::getAvailableDrivers()) or - $this->adapter == "pgsql" and in_array("pgsql", PDO::getAvailableDrivers())) + elseif (class_exists("PDO") and + ($this->adapter == "sqlite" and in_array("sqlite", PDO::getAvailableDrivers()) or + $this->adapter == "pgsql" and in_array("pgsql", PDO::getAvailableDrivers()))) $this->method = "pdo"; } else if (class_exists("MySQLi")) $this->method = "mysqli"; elseif (function_exists("mysql_connect")) $this->method = "mysql"; - elseif (in_array("mysql", PDO::getAvailableDrivers())) + elseif (class_exists("PDO") and in_array("mysql", PDO::getAvailableDrivers())) $this->method = "pdo"; } @@ -217,7 +218,7 @@ "TEXT", "INSERT INTO"), $query); - + $query = new Query($this, $query, $params, $throw_exceptions); return (!$query->query and UPGRADING) ? false : $query ; includes/class/SQL.php @@ -120,6 +120,10 @@ class Twig_LoopContextIterator implements Iterator } } +function unretarded_array_unshift(&$arr, &$val) { + $arr = array_merge(array(&$val), $arr); +} + /** * This is called like an ordinary filter just with the name of the filter * as first argument. Currently we just raise an exception here but it @@ -135,9 +139,10 @@ function twig_missing_filter($name) array_shift($args); array_unshift($args, $name); - array_unshift($args, $text); + unretarded_array_unshift($args, $text); $trigger = Trigger::current(); + if ($trigger->exists($name)) return call_user_func_array(array($trigger, "filter"), $args); includes/class/Twig/runtime.php e28c562cbcb6b2eb222b2961ee7bd86a09159fb9 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/a373645ec77775d40fb0b9e15a7c94dde5dbfc41 a373645ec77775d40fb0b9e15a7c94dde5dbfc41 2009-08-29T07:21:07-07:00 2009-08-29T07:19:07-07:00 * Fixed Twig filter fallback in PHP 5.3. [#46 state:resolved] * Fixed some logic in SQL class to check for the PDO class before using a PDO function. * Fixed buttons not having a .selected style (e.g. while previewing a theme, the preview button for it should be depressed) 937083374992327d229fe25e212eb4fcc6dfa074 Alex Suraci i.am@toogeneric.com