diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php index f5836c4b..b574079d 100644 --- a/adminer/drivers/mssql.inc.php +++ b/adminer/drivers/mssql.inc.php @@ -495,8 +495,8 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table) } foreach ($comments as $key => $val) { $comment = substr($val, 9); // 9 - strlen(" COMMENT ") - queries("EXEC sp_dropextendedproperty @name = N'MS_Description', @level0type = N'Schema', @level0name = " . q(get_schema()) . ", @level1type = N'Table', @level1name = " . q($name) . ", @level2type = N'Column', @level2name = " . q($key)); - queries("EXEC sp_addextendedproperty @name = N'MS_Description', @value = " . $comment . ", @level0type = N'Schema', @level0name = " . q(get_schema()) . ", @level1type = N'Table', @level1name = " . q($name) . ", @level2type = N'Column', @level2name = " . q($key)); + queries("EXEC sp_dropextendedproperty @name = N'MS_Description', @level0type = N'Schema', @level0name = " . q(get_schema()) . ", @level1type = N'Table', @level1name = " . q($name) . ", @level2type = N'Column', @level2name = " . q($key)); + queries("EXEC sp_addextendedproperty @name = N'MS_Description', @value = " . $comment . ", @level0type = N'Schema', @level0name = " . q(get_schema()) . ", @level1type = N'Table', @level1name = " . q($name) . ", @level2type = N'Column', @level2name = " . q($key)); } return true; } diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php index 2114395f..4895df0c 100644 --- a/adminer/drivers/pgsql.inc.php +++ b/adminer/drivers/pgsql.inc.php @@ -396,7 +396,7 @@ ORDER BY a.attnum" $return = array(); $table_oid = $connection2->result("SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) AND relname = " . q($table)); $columns = get_key_vals("SELECT attnum, attname FROM pg_attribute WHERE attrelid = $table_oid AND attnum > 0", $connection2); - foreach (get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption , (indpred IS NOT NULL)::int as indispartial FROM pg_index i, pg_class ci WHERE i.indrelid = $table_oid AND ci.oid = i.indexrelid", $connection2) as $row) { + foreach (get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption, (indpred IS NOT NULL)::int as indispartial FROM pg_index i, pg_class ci WHERE i.indrelid = $table_oid AND ci.oid = i.indexrelid", $connection2) as $row) { $relname = $row["relname"]; $return[$relname]["type"] = ($row["indispartial"] ? "INDEX" : ($row["indisprimary"] ? "PRIMARY" : ($row["indisunique"] ? "UNIQUE" : "INDEX"))); $return[$relname]["columns"] = array(); diff --git a/adminer/include/pdo.inc.php b/adminer/include/pdo.inc.php index f7b11c67..ed7ac497 100644 --- a/adminer/include/pdo.inc.php +++ b/adminer/include/pdo.inc.php @@ -18,7 +18,7 @@ if (extension_loaded('pdo')) { } catch (Exception $ex) { auth_error(h($ex->getMessage())); } - $this->pdo->setAttribute(3, 1); // 3 - PDO::ATTR_ERRMODE, 1 - PDO::ERRMODE_WARNING + $this->pdo->setAttribute(3, 1); // 3 - PDO::ATTR_ERRMODE, 1 - PDO::ERRMODE_WARNING $this->pdo->setAttribute(13, array('Min_PDOStatement')); // 13 - PDO::ATTR_STATEMENT_CLASS $this->server_info = @$this->pdo->getAttribute(4); // 4 - PDO::ATTR_SERVER_VERSION } diff --git a/adminer/lang/de.inc.php b/adminer/lang/de.inc.php index 71c1bc22..bd78a0fc 100644 --- a/adminer/lang/de.inc.php +++ b/adminer/lang/de.inc.php @@ -280,7 +280,7 @@ $translations = array( 'If you did not send this request from Adminer then close this page.' => 'Wenn Sie diese Anfrage nicht von Adminer gesendet haben, schließen Sie diese Seite.', 'You can upload a big SQL file via FTP and import it from server.' => 'Sie können eine große SQL-Datei per FTP hochladen und dann vom Server importieren.', 'You are offline.' => 'Sie sind offline.', - 'You have no privileges to update this table.' => 'Sie haben keine Rechte, um diese Tabelle zu aktualisieren.' , + 'You have no privileges to update this table.' => 'Sie haben keine Rechte, um diese Tabelle zu aktualisieren.', 'Saving' => 'Speichere', 'yes' => 'ja', 'no' => 'nein', diff --git a/plugins/tinymce.php b/plugins/tinymce.php index 44ee37f5..a6cad006 100644 --- a/plugins/tinymce.php +++ b/plugins/tinymce.php @@ -40,8 +40,8 @@ tinyMCE.init({ function selectVal(&$val, $link, $field, $original) { if (preg_match("~_html~", $field["field"]) && $val != '') { - $ellipsis = ""; - $length = strlen($ellipsis); + $ellipsis = ""; + $length = strlen($ellipsis); $shortened = (substr($val, -$length) == $ellipsis); if ($shortened) { $val = substr($val, 0, -$length);