diff --git a/include/ajax.upgrader.php b/include/ajax.upgrader.php index fa0b50a99c9c8271caf96e927c6032bbde4b9eee..92a3e6ef7884a47f9ae6d52a50606cf1f080acc4 100644 --- a/include/ajax.upgrader.php +++ b/include/ajax.upgrader.php @@ -25,7 +25,7 @@ class UpgraderAjaxAPI extends AjaxController { if(!$thisstaff or !$thisstaff->isAdmin() or !$ost) Http::response(403, 'Access Denied'); - $upgrader = new Upgrader($ost->getDBSignature(), TABLE_PREFIX, PATCH_DIR); + $upgrader = new Upgrader($ost->getDBSignature(), TABLE_PREFIX, SQL_DIR); //Just report the next action on the first call. if(!$_SESSION['ost_upgrader'] || !$_SESSION['ost_upgrader'][$upgrader->getShash()]['progress']) { diff --git a/include/upgrader/patches/02decaa2-60fcbee1.patch.sql b/include/upgrader/sql/02decaa2-60fcbee1.patch.sql similarity index 100% rename from include/upgrader/patches/02decaa2-60fcbee1.patch.sql rename to include/upgrader/sql/02decaa2-60fcbee1.patch.sql diff --git a/include/upgrader/patches/15af7cd3-98ae1ed2.patch.sql b/include/upgrader/sql/15af7cd3-98ae1ed2.patch.sql similarity index 100% rename from include/upgrader/patches/15af7cd3-98ae1ed2.patch.sql rename to include/upgrader/sql/15af7cd3-98ae1ed2.patch.sql diff --git a/include/upgrader/patches/2e20a0eb-98ae1ed2.patch.sql b/include/upgrader/sql/2e20a0eb-98ae1ed2.patch.sql similarity index 100% rename from include/upgrader/patches/2e20a0eb-98ae1ed2.patch.sql rename to include/upgrader/sql/2e20a0eb-98ae1ed2.patch.sql diff --git a/include/upgrader/patches/435c62c3-2e7531a2.cleanup.sql b/include/upgrader/sql/435c62c3-2e7531a2.cleanup.sql similarity index 100% rename from include/upgrader/patches/435c62c3-2e7531a2.cleanup.sql rename to include/upgrader/sql/435c62c3-2e7531a2.cleanup.sql diff --git a/include/upgrader/patches/435c62c3-2e7531a2.patch.sql b/include/upgrader/sql/435c62c3-2e7531a2.patch.sql similarity index 100% rename from include/upgrader/patches/435c62c3-2e7531a2.patch.sql rename to include/upgrader/sql/435c62c3-2e7531a2.patch.sql diff --git a/include/upgrader/patches/49478749-c2d2fabf.patch.sql b/include/upgrader/sql/49478749-c2d2fabf.patch.sql similarity index 100% rename from include/upgrader/patches/49478749-c2d2fabf.patch.sql rename to include/upgrader/sql/49478749-c2d2fabf.patch.sql diff --git a/include/upgrader/patches/522e5b78-02decaa2.patch.sql b/include/upgrader/sql/522e5b78-02decaa2.patch.sql similarity index 100% rename from include/upgrader/patches/522e5b78-02decaa2.patch.sql rename to include/upgrader/sql/522e5b78-02decaa2.patch.sql diff --git a/include/upgrader/patches/60fcbee1-f8856d56.patch.sql b/include/upgrader/sql/60fcbee1-f8856d56.patch.sql similarity index 100% rename from include/upgrader/patches/60fcbee1-f8856d56.patch.sql rename to include/upgrader/sql/60fcbee1-f8856d56.patch.sql diff --git a/include/upgrader/patches/7be60a84-522e5b78.patch.sql b/include/upgrader/sql/7be60a84-522e5b78.patch.sql similarity index 100% rename from include/upgrader/patches/7be60a84-522e5b78.patch.sql rename to include/upgrader/sql/7be60a84-522e5b78.patch.sql diff --git a/include/upgrader/patches/98ae1ed2-e342f869.cleanup.sql b/include/upgrader/sql/98ae1ed2-e342f869.cleanup.sql similarity index 100% rename from include/upgrader/patches/98ae1ed2-e342f869.cleanup.sql rename to include/upgrader/sql/98ae1ed2-e342f869.cleanup.sql diff --git a/include/upgrader/patches/98ae1ed2-e342f869.patch.sql b/include/upgrader/sql/98ae1ed2-e342f869.patch.sql similarity index 100% rename from include/upgrader/patches/98ae1ed2-e342f869.patch.sql rename to include/upgrader/sql/98ae1ed2-e342f869.patch.sql diff --git a/include/upgrader/patches/a67ba35e-98ae1ed2.patch.sql b/include/upgrader/sql/a67ba35e-98ae1ed2.patch.sql similarity index 100% rename from include/upgrader/patches/a67ba35e-98ae1ed2.patch.sql rename to include/upgrader/sql/a67ba35e-98ae1ed2.patch.sql diff --git a/include/upgrader/patches/aa4664af-b19dc97d.patch.sql b/include/upgrader/sql/aa4664af-b19dc97d.patch.sql similarity index 100% rename from include/upgrader/patches/aa4664af-b19dc97d.patch.sql rename to include/upgrader/sql/aa4664af-b19dc97d.patch.sql diff --git a/include/upgrader/patches/abe9c0cb-bbb021fb.patch.sql b/include/upgrader/sql/abe9c0cb-bbb021fb.patch.sql similarity index 100% rename from include/upgrader/patches/abe9c0cb-bbb021fb.patch.sql rename to include/upgrader/sql/abe9c0cb-bbb021fb.patch.sql diff --git a/include/upgrader/patches/aee589ab-98ae1ed2.patch.sql b/include/upgrader/sql/aee589ab-98ae1ed2.patch.sql similarity index 100% rename from include/upgrader/patches/aee589ab-98ae1ed2.patch.sql rename to include/upgrader/sql/aee589ab-98ae1ed2.patch.sql diff --git a/include/upgrader/patches/b19dc97d-435c62c3.patch.sql b/include/upgrader/sql/b19dc97d-435c62c3.patch.sql similarity index 100% rename from include/upgrader/patches/b19dc97d-435c62c3.patch.sql rename to include/upgrader/sql/b19dc97d-435c62c3.patch.sql diff --git a/include/upgrader/patches/bbb021fb-49478749.patch.sql b/include/upgrader/sql/bbb021fb-49478749.patch.sql similarity index 100% rename from include/upgrader/patches/bbb021fb-49478749.patch.sql rename to include/upgrader/sql/bbb021fb-49478749.patch.sql diff --git a/include/upgrader/patches/c00511c7-7be60a84.cleanup.sql b/include/upgrader/sql/c00511c7-7be60a84.cleanup.sql similarity index 100% rename from include/upgrader/patches/c00511c7-7be60a84.cleanup.sql rename to include/upgrader/sql/c00511c7-7be60a84.cleanup.sql diff --git a/include/upgrader/patches/c00511c7-7be60a84.patch.sql b/include/upgrader/sql/c00511c7-7be60a84.patch.sql similarity index 100% rename from include/upgrader/patches/c00511c7-7be60a84.patch.sql rename to include/upgrader/sql/c00511c7-7be60a84.patch.sql diff --git a/include/upgrader/patches/c2d2fabf-aa4664af.patch.sql b/include/upgrader/sql/c2d2fabf-aa4664af.patch.sql similarity index 100% rename from include/upgrader/patches/c2d2fabf-aa4664af.patch.sql rename to include/upgrader/sql/c2d2fabf-aa4664af.patch.sql diff --git a/include/upgrader/patches/e342f869-c00511c7.patch.sql b/include/upgrader/sql/e342f869-c00511c7.patch.sql similarity index 100% rename from include/upgrader/patches/e342f869-c00511c7.patch.sql rename to include/upgrader/sql/e342f869-c00511c7.patch.sql diff --git a/include/upgrader/patches/f8856d56-abe9c0cb.patch.sql b/include/upgrader/sql/f8856d56-abe9c0cb.patch.sql similarity index 100% rename from include/upgrader/patches/f8856d56-abe9c0cb.patch.sql rename to include/upgrader/sql/f8856d56-abe9c0cb.patch.sql diff --git a/main.inc.php b/main.inc.php index de583038de666371ad458930768ef75f1751cd53..6d30b7fce585c53f346824aa3a9233bc87311094 100644 --- a/main.inc.php +++ b/main.inc.php @@ -57,7 +57,7 @@ define('SETUP_DIR',INCLUDE_DIR.'setup/'); define('UPGRADE_DIR', INCLUDE_DIR.'upgrader/'); - define('PATCH_DIR', UPGRADE_DIR.'patches/'); + define('SQL_DIR', UPGRADE_DIR.'sql/'); /*############## Do NOT monkey with anything else beyond this point UNLESS you really know what you are doing ##############*/ diff --git a/scp/upgrade.php b/scp/upgrade.php index c424f425cc019acb864c74a393a7adb89827f26d..3bb850e837671a556996b1e8b0fb877fe53560f9 100644 --- a/scp/upgrade.php +++ b/scp/upgrade.php @@ -17,7 +17,7 @@ require_once 'admin.inc.php'; require_once INCLUDE_DIR.'class.upgrader.php'; //$_SESSION['ost_upgrader']=null; -$upgrader = new Upgrader($cfg->getSchemaSignature(), TABLE_PREFIX, PATCH_DIR); +$upgrader = new Upgrader($cfg->getSchemaSignature(), TABLE_PREFIX, SQL_DIR); $errors=array(); if($_POST && $_POST['s'] && !$upgrader->isAborted()) { switch(strtolower($_POST['s'])) {