Commit f09a9d22 authored by metzlerd's avatar metzlerd
Browse files

#1438326 Postgres casting syntax and mysql assignment.

Fixed notice. 
parent 15f305be
......@@ -4,7 +4,7 @@
* General Forena Reporting Class
*/
define('FRX_TOKEN_EXP', '/\{[^\n^\r^}]+}/');
define('FRX_SQL_TOKEN', '/:([a-z]|[0-9]|{A-Z]|[_\.])+/');
define('FRX_SQL_TOKEN', '/:[a-zA-Z]([a-zA-Z]|[0-9]|[_\.])+/');
class Frx {
......
......@@ -20,7 +20,7 @@ class FrxDrupal extends FrxDataSource {
*/
public function __construct($conf, $repos_path, $name) {
parent::__construct($conf, $repos_path, $name);
if (@$conf['database'] != 'default') {
if (@$conf['database'] && @$conf['database'] != 'default') {
$this->database = $conf['database'];
}
// Set up the stuff required to translate.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment