Mirror
/
codiad
mirror of https://github.com/xevidos/codiad.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed issues with non empty folder.

This commit is contained in:
xevidos 2018-12-11 18:50:15 -05:00
parent 0a0f4007bb
commit 485c099fe4
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
components/update/update.php
View File

@ -4,7 +4,6 @@ ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
error_reporting(E_ALL);
require_once('../../config.php');
require_once('../../common.php');
require_once('./class.update.php');
@ -127,13 +126,21 @@ class updater {
function convert() {
require_once('../../common.php');
require_once('../sql/class.sql.php');
require_once('../settings/class.settings.php');
require_once('../project/class.project.php');
require_once('../user/class.user.php');
$user_settings_file = DATA . "/settings.php";
$projects_file = DATA . "/projects.php";
$users_file = DATA . "/users.php";
$Settings = new Settings();
$Project = new Project();
$User = new User();
$connection = $Settings->connect();
$connection = $Settings->connect();
$sql = "
-- phpMyAdmin SQL Dump
@ -279,11 +286,6 @@ ALTER TABLE `user_options`
$result = mysqli_prepare( $connection, $sql ) or die( $error );
$result->bind_param( $bind, ...$bind_variables );
$result->execute();
if( $connection->error ) {
$return = formatJSEND( "error", $connection->error );
}
if( file_exists( $user_settings_file ) ) {
@ -467,6 +469,12 @@ ALTER TABLE `user_options`
$this->path . "/.travis.yml",
$this->path . "/codiad-master/.travis.yml",
$this->path . "/.gitignore",
$this->path . "/codiad-master/.gitignore",
$this->path . "/.gitlab-ci.yml",
$this->path . "/codiad-master/.gitlab-ci.yml"
);
foreach( $file_conflictions as $file ) {
@ -776,4 +784,4 @@ if( isset( $_GET["action"] ) && $_GET["action"] !== '' ) {
codiad.update.init();
</script>
</body>
</html>
</html>