fix CRM-12096

diff --git a/distmaker/distmaker.sh b/distmaker/distmaker.sh
index 713912fa6e3e466a8a9039df96ec69a8e23eeb9b..e1a5699bc0403f711c1765e0e715936cf0c884e0 100755 (executable)
--- a/distmaker/distmaker.sh
+++ b/distmaker/distmaker.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -v
 set -e
 
 # This is distmaker script for CiviCRM

diff --git a/distmaker/dists/joomla_php5.sh b/distmaker/dists/joomla_php5.sh
index 2e1afd7b182b07d72c6d24c4f368371e493c8547..118d68b2a99e1252429d6479df4ff3fd5873b243 100755 (executable)
--- a/distmaker/dists/joomla_php5.sh
+++ b/distmaker/dists/joomla_php5.sh
@@ -97,6 +97,9 @@ cp -r -p civicrm/joomla/admin/helpers/*          com_civicrm/admin/helpers
 cp -r -p civicrm/joomla/admin/plugins/*          com_civicrm/admin/plugins
 cp civicrm/joomla/admin/language/en-GB/*         com_civicrm/admin/language/en-GB
 
+# joomla 3.0 like admin.civicrm.php to be called civicrm.php
+# lets keep both versions there
+cp com_civicrm/admin/admin.civicrm.php com_civicrm/admin/civicrm.php
 
 # copying front end code
 cp civicrm/joomla/site/civicrm.html.php      com_civicrm/site

diff --git a/xml/templates/joomla.tpl b/xml/templates/joomla.tpl
index 5613e631efe316c7be305f49ee43e2c478878c3c..2add0409b1a7f5661d27244fccd1fb4f65ccb191 100644 (file)
--- a/xml/templates/joomla.tpl
+++ b/xml/templates/joomla.tpl
@@ -27,6 +27,7 @@
     <menu task="civicrm/dashboard&amp;reset=1">COM_CIVICRM_MENU</menu>
     <files folder="admin">
       <filename>admin.civicrm.php</filename>
+      <filename>civicrm.php</filename>
       <filename>toolbar.civicrm.php</filename>
       <filename>toolbar.civicrm.html.php</filename>
       <filename>configure.php</filename>