Fix installer. Install meta.syncable tables as well.

pydio · Dec 18, 2013 · d81bf00 · d81bf00
1 parent bec749b
commit d81bf00
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/src/plugins/boot.conf/class.BootConfLoader.php b/core/src/plugins/boot.conf/class.BootConfLoader.php
@@ -152,7 +152,7 @@ public function applyInstallerForm($action, $httpVars, $fileVars)
             ));
 
             // INSTALL ALL SQL TABLES
-            $sqlPlugs = array("conf.sql", "auth.sql", "feed.sql", "log.sql", "mq.sql");
+            $sqlPlugs = array("conf.sql", "auth.sql", "feed.sql", "log.sql", "mq.sql", "meta.syncable");
             foreach ($sqlPlugs as $plugId) {
                 $plug = AJXP_PluginsService::findPluginById($plugId);
                 $plug->installSQLTables(array("SQL_DRIVER" => $data["STORAGE_TYPE"]["db_type"]));

diff --git a/core/src/plugins/boot.conf/manifest.xml b/core/src/plugins/boot.conf/manifest.xml
@@ -68,7 +68,7 @@
                     </clientCallback>
                     <clientForm id="installer_form"><![CDATA[
                         <div id="installer_form" box_padding="0" box_resize="true" box_width="560" overlayStyle='{"backgroundColor":"white","opacity":10,"backgroundImage":"url(\"AJXP_THEME_FOLDER/images/grid_t.png\")"}' style="padding: 10px; overflow:auto; background-color: white;">
-                            <img src="plugins/gui.ajax/PydioLogo250.png" style="display:block;">
+                            <img src="plugins/gui.ajax/PydioLogo250.png" style="display:block;margin:0 auto;">
                             <div class="dialogLegend installerWelcome"> Thank you for installing Pydio!<br> This tool will make sure your new sharing platform is up and running in no time: browse through the various sections to set up the general behaviour of the application. You can fly over the fields labels with your mouse to get more information. <br>Are you ready ? <span id="start_button">Start wizard!</span></div>
                             <div id="the_form" style="display:none; margin:0 5px;"></div>
                             <div id="configuration_progress" class="dialogLegend installerWelcome" style="display:none; margin:0 5px;">

diff --git a/core/src/plugins/meta.syncable/class.ChangesTracker.php b/core/src/plugins/meta.syncable/class.ChangesTracker.php
@@ -173,7 +173,7 @@ public function updateNodesIndex($oldNode = null, $newNode = null, $copy = false
 
     public function installSQLTables($param)
     {
-        $p = AJXP_Utils::cleanDibiDriverParameters($this->sqlDriver);
+        $p = AJXP_Utils::cleanDibiDriverParameters(isSet($param) && isSet($param["SQL_DRIVER"])?$param["SQL_DRIVER"]:$this->sqlDriver);
         return AJXP_Utils::runCreateTablesQuery($p, $this->getBaseDir()."/create.sql");
     }