Fixes for setting the default table storage (MySQL 5.5+), reset autho…

…r password, page manager fix
symphonycms · Mar 9, 2016 · 5e3bf4f · brendo · Mar 30, 2016 · nitriques
1 parent a2755bb
commit 5e3bf4f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/symphony/content/content.blueprintspages.php b/symphony/content/content.blueprintspages.php
@@ -658,6 +658,8 @@ public function __actionEdit()
                 $types = @array_map('trim', $types);
                 unset($fields['type']);
 
+                $fields = array_filter($fields);
+
                 $fields['parent'] = ($fields['parent'] != __('None') ? $fields['parent'] : null);
                 $fields['data_sources'] = is_array($fields['data_sources']) ? implode(',', $fields['data_sources']) : null;
                 $fields['events'] = is_array($fields['events']) ? implode(',', $fields['events']) : null;

diff --git a/symphony/content/content.login.php b/symphony/content/content.login.php
@@ -232,18 +232,18 @@ public function action()
                         SELECT `id`, `email`, `first_name`
                         FROM `tbl_authors`
                         WHERE `email` = ? OR `username` = ?
-                    ", 
+                    ",
                     array(
-                        $_POST['email'], 
+                        $_POST['email'],
                         $_POST['email']
                     )
                 );
 
                 if (!empty($author)) {
                     // Delete all expired tokens
-                    Symphony::Database()->delete('tbl_forgotpass', "
-                        `expiry` < ?", DateTimeObj::getGMT('c')
-                    );
+                    Symphony::Database()->delete('tbl_forgotpass', "`expiry` < ?", array(
+                        DateTimeObj::getGMT('c')
+                    ));
 
                     // Attempt to retrieve the token that is not expired for this Author ID,
                     // otherwise generate one.

diff --git a/symphony/lib/toolkit/class.mysql.php b/symphony/lib/toolkit/class.mysql.php
@@ -201,7 +201,7 @@ public function connect($host = null, $user = null, $password = null, $port = '3
         MySQL::$_conn_pdo = new Database($config);
 
         // Ensure that the default storage engine is InnoDB:
-        MySQL::$_conn_pdo->conn->exec('SET storage_engine = "InnoDB"');
+        MySQL::$_conn_pdo->conn->exec('SET default_storage_engine = "InnoDB"');
 
         return true;
     }

diff --git a/symphony/lib/toolkit/class.pagemanager.php b/symphony/lib/toolkit/class.pagemanager.php
@@ -630,7 +630,7 @@ public static function fetchPageTypes($page_id = null)
             SELECT
                 type
             FROM
-                `tbl_pages_types` AS pt " 
+                `tbl_pages_types` AS pt "
             . $where . "
             GROUP BY
                 pt.type