Merge pull request #9830 from Extarys/actionfade

[friendica.git] / src / Database / View.php

diff --git a/src/Database/View.php b/src/Database/View.php
index 51d051786dc89b1e4de0ea89b53cb887d033e388..e49eb8cc51cfcc7f664b1054e83cc1eff823401a 100644 (file)
--- a/src/Database/View.php
+++ b/src/Database/View.php
@@ -112,16 +112,16 @@ class View
                }
 
                if (self::isView($name)) {
-                       $sql = sprintf("DROP VIEW `%s`", DBA::escape($name));
+                       $sql = sprintf("DROP VIEW IF EXISTS `%s`", DBA::escape($name));
                } elseif (self::isTable($name)) {
-                       $sql = sprintf("DROP TABLE `%s`", DBA::escape($name));
+                       $sql = sprintf("DROP TABLE IF EXISTS `%s`", DBA::escape($name));
                }
 
-               if ($verbose) {
+               if (!empty($sql) && $verbose) {
                        echo $sql . ";\n";
                }
 
-               if ($action) {
+               if (!empty($sql) && $action) {
                        DBA::e($sql);
                }
 
@@ -158,7 +158,7 @@ class View
        }
 
        /**
-        * Check if the given table/view is a view
+        * Check if the given table/view is a table
         *
         * @param string $table
         * @return boolean "true" if it's a table