From: Donald A. Lobo <lobo@civicrm.org>
Date: Mon, 11 Mar 2013 22:29:02 +0000 (-0700)
Subject: fix CRM-12096
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=01ad1437e4569d185be1664070004d22fd5c6ffe;p=civicrm-core.git

fix CRM-12096
---

diff --git a/distmaker/distmaker.sh b/distmaker/distmaker.sh
index 713912fa6e..e1a5699bc0 100755
--- 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 2e1afd7b18..118d68b2a9 100755
--- 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 5613e631ef..2add0409b1 100644
--- 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>