Merge remote-tracking branch 'upstream/master'

diff --git a/include/dba_pdo.php b/include/dba_pdo.php
index 7cd8c638e7f60955364b93b3ea84a591a5b29adc..eed9ea1251150e29342a3fe35f8417eaad28073b 100644 (file)
--- a/include/dba_pdo.php
+++ b/include/dba_pdo.php
@@ -126,6 +126,7 @@ class dba {
       # bad workaround to emulate the bizzare behavior of mysql_query
       if(in_array($strSQLType, array('INSERT', 'UPDATE', 'DELETE', 'CREATE', 'DROP', 'SET')))
         $result = true;
+      $intErrorCode = false;
         
     } catch (\Exception $objException) {
       $result = false;

diff --git a/view/theme/decaf-mobile/templates/head.tpl b/view/theme/decaf-mobile/templates/head.tpl
index 07398391f12757b982302636ca2473d3b8e30d2d..9d815efcf2b4414188ef3e83d43d4c0e5d2943bd 100644 (file)
--- a/view/theme/decaf-mobile/templates/head.tpl
+++ b/view/theme/decaf-mobile/templates/head.tpl
@@ -1,21 +1,8 @@
-{{*
- *     AUTOMATICALLY GENERATED TEMPLATE
- *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-{{*<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
-<meta content='True' name='HandheldFriendly'>
-<meta content='320' name='MobileOptimized'>-->*}}
-<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
-{{*<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->*}}
+<meta name="viewport" content="width=device-width; initial-scale = 1.0;" />
 
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
-{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />-->*}}
 
 <link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
 

diff --git a/view/theme/frost-mobile/templates/head.tpl b/view/theme/frost-mobile/templates/head.tpl
index d11d072f2649d6f7cf5de5e47f9a589527851edc..abc4fa731e125388ac32b6a3c92e05f529f2c59f 100644 (file)
--- a/view/theme/frost-mobile/templates/head.tpl
+++ b/view/theme/frost-mobile/templates/head.tpl
@@ -1,20 +1,8 @@
-{{*
- *     AUTOMATICALLY GENERATED TEMPLATE
- *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-{{*<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
-<meta content='True' name='HandheldFriendly'>
-<meta content='320' name='MobileOptimized'>-->*}}
-<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
-{{*<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->*}}
+<meta name="viewport" content="width=device-width; initial-scale = 1.0;" />
 
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
-{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />-->*}}
 <link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
 
 <link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />