Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch '1.3.x' of github.com:zikula/zikula-standard into 1.3.x

  • Loading branch information...
commit 4a23453e8c80c49e3439c364a397dd5b9a86bf25 2 parents 61422b9 + 169ef7f
Drak drak authored

Showing 2 changed files with 4 additions and 3 deletions. Show diff stats Hide diff stats

  1. +2 2 build.xml
  2. +2 1  src/install/lib.php
4 build.xml
@@ -69,7 +69,7 @@
69 69 <exec command="mv ${builddir}/tmp/Profile/src/modules/Profile ${packagepath}/modules" />
70 70
71 71 <exec command="git clone git://github.com/zikula-modules/Clip.git ${builddir}/tmp/Clip" />
72   - <exec command="cd ${builddir}/tmp/Clip; git checkout 0.9.3" />
  72 + <exec command="cd ${builddir}/tmp/Clip; git checkout 0.9.4" />
73 73 <exec command="mv ${builddir}/tmp/Clip/src/modules/Clip ${packagepath}/modules" />
74 74
75 75 <exec command="git clone git://github.com/zikula-modules/Scribite ${builddir}/tmp/Scribite" />
@@ -79,7 +79,7 @@
79 79 <exec command="rm -rf ${packagepath}/modules/Scribite/plugins/Aloha" />
80 80 <exec command="rm -rf ${packagepath}/modules/Scribite/plugins/CKEditor" />
81 81 <exec command="rm -rf ${packagepath}/modules/Scribite/plugins/MarkItUp" />
82   - <exec command="rm -rf ${packagepath}/modules/Scribite/plugins/NiceEdit" />
  82 + <exec command="rm -rf ${packagepath}/modules/Scribite/plugins/NicEdit" />
83 83 <exec command="rm -rf ${packagepath}/modules/Scribite/plugins/WYMeditor" />
84 84 <exec command="rm -rf ${packagepath}/modules/Scribite/plugins/Wysihtml5" />
85 85 <exec command="rm -rf ${packagepath}/modules/Scribite/plugins/Xinha" />
3  src/install/lib.php
@@ -208,7 +208,8 @@ function install(Zikula_Core $core)
208 208 // checks if exists a previous installation with the same prefix
209 209 $proceed = true;
210 210 $dbnameConfig = $GLOBALS['ZConfig']['DBInfo']['databases']['default']['dbname'];
211   - $exec = ($dbdriver == 'mysql' || $dbdriver == 'mysqli') ?
  211 + $dbdriverConfig = $GLOBALS['ZConfig']['DBInfo']['databases']['default']['dbdriver'];
  212 + $exec = ($dbdriverConfig == 'mysql' || $dbdriverConfig == 'mysqli') ?
212 213 "SHOW TABLES FROM `$dbnameConfig` LIKE '%'" :
213 214 "SHOW TABLES FROM $dbnameConfig LIKE '%'";
214 215 $tables = DBUtil::executeSQL($exec);

0 comments on commit 4a23453

Please sign in to comment.
Something went wrong with that request. Please try again.