Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 3d43dbb

Browse files
committed
Merge branch 'develop' of http://github.com/pydio/pydio-core into develop
* 'develop' of http://github.com/pydio/pydio-core: Fix #1192 : use mysqli by default Force overriding conf/extensions.conf.php during upgrade, as output format changed. Init new release note. FIx JSPacker static function call. Fixing again parenthesis in background URL. Use double-quotes instead of simple for links. Maybe see #1138
2 parents f1e4da5 + ca3b3ba commit 3d43dbb

File tree

7 files changed

+1584
-1296
lines changed

7 files changed

+1584
-1296
lines changed

core/src/conf/RELEASE_NOTE

Lines changed: 1427 additions & 1291 deletions
Large diffs are not rendered by default.

core/src/core/classes/class.AJXP_JSPacker.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static function pack()
6262
* @param $mode
6363
* @return bool
6464
*/
65-
public function concatListAndPack($src, $out, $mode)
65+
public static function concatListAndPack($src, $out, $mode)
6666
{
6767
if (!is_file($src) || !is_readable($src)) {
6868
return false;

core/src/plugins/action.share/res/react/model/ShareModel.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@
870870
s = MessageHash["share_center.42"];
871871
if(s) s = s.replace("%s", ApplicationTitle);
872872
link = this.getPublicLink(linkId);
873-
message = s + "\n\n " + "<a href='"+link+"'>"+link+"</a>";
873+
message = s + "\n\n " + "<a href=\""+link+"\">"+link+"</a>";
874874
}else{
875875
if(!this._data['repository_url']){
876876
throw new Error(MessageHash['share_center.229']);
@@ -880,7 +880,7 @@
880880
if(this._data['repository_url']){
881881
link = this._data['repository_url'];
882882
}
883-
message = s + "\n\n " + "<a href='" + link +"'>" + MessageHash["share_center.46"].replace("%s1", this.getGlobal("label")).replace("%s2", ajaxplorer.appTitle) + "</a>";
883+
message = s + "\n\n " + "<a href=\"" + link +"\">" + MessageHash["share_center.46"].replace("%s1", this.getGlobal("label")).replace("%s2", ajaxplorer.appTitle) + "</a>";
884884
}
885885
var usersList = null;
886886
if(this.shareFolderMode == 'workspace' && oForm) {

core/src/plugins/core.ajaxplorer/ajxp_mixins.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_database" default="pydio" label="MIXIN_MESSAGE[Database]" description="MIXIN_MESSAGE[Database name]" type="string" mandatory="true"/>
6666
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_username" default="" label="MIXIN_MESSAGE[User]" description="MIXIN_MESSAGE[User name]" type="string" mandatory="true"/>
6767
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_password" default="" label="MIXIN_MESSAGE[Password]" description="MIXIN_MESSAGE[User password]" type="password" mandatory="true"/>
68-
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_use_mysqli" default="false" label="MIXIN_MESSAGE[Use MySQLi]" description="MIXIN_MESSAGE[Use PHP MySQLi extension]" type="boolean" mandatory="true"/>
68+
<global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_use_mysqli" default="true" label="MIXIN_MESSAGE[Use MySQLi]" description="MIXIN_MESSAGE[Use PHP MySQLi extension]" type="boolean" mandatory="true"/>
6969
<global_param group_switch_name="dibi_provider" group_switch_label="Sqlite 3" group_switch_value="sqlite3" name="sqlite3_driver" default="sqlite3" label="MIXIN_MESSAGE[Driver]" description="MIXIN_MESSAGE[Driver type (do not touch)]" type="hidden" mandatory="true"/>
7070
<global_param group_switch_name="dibi_provider" group_switch_label="Sqlite 3" group_switch_value="sqlite3" name="sqlite3_formatDate" default="'Y-m-d'" label="formatDate" description="formatDate (do not touch)" type="hidden" mandatory="true"/>
7171
<global_param group_switch_name="dibi_provider" group_switch_label="Sqlite 3" group_switch_value="sqlite3" name="sqlite3_formatDateTime" default="'Y-m-d H:i:s'" label="formatDateTime" description="formatDateTime (do not touch)" type="hidden" mandatory="true"/>

core/src/plugins/gui.ajax/res/js/ui/prototype/class.PreviewFactory.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Class.create("PreviewFactory", {
9292
var bgUrl = oImageToLoad.editorClass.prototype.getCoveringBackgroundSource(oImageToLoad.ajxpNode);
9393
bgUrl = bgUrl.replace('(', '\\(').replace(')', '\\)').replace('\'', '\\\'');
9494
oImageToLoad.mainObject.setStyle({
95-
backgroundImage:'url(' + oImageToLoad.editorClass.prototype.getCoveringBackgroundSource(oImageToLoad.ajxpNode) + ')',
95+
backgroundImage:'url(' + bgUrl + ')',
9696
backgroundSize : 'cover'
9797
});
9898
}else{

0 commit comments

Comments
 (0)