diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2011-12-09 15:25:26 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2011-12-09 15:25:26 +0100 |
| commit | 7aa8eb3427679366905840b80a69e36344a5632d (patch) | |
| tree | 347a2100ad445620ed21b17f9faa90fe0edb3874 /apps/contacts/templates/index.php | |
| parent | b3661adf028570f6158dfd5092ecb1398d5be0df (diff) | |
| parent | eeaf539a4414e3081b6f6652167363a3221a1973 (diff) | |
| download | nextcloud-server-7aa8eb3427679366905840b80a69e36344a5632d.tar.gz nextcloud-server-7aa8eb3427679366905840b80a69e36344a5632d.zip | |
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
Conflicts:
apps/contacts/ajax/deletebook.php
apps/contacts/index.php
Diffstat (limited to 'apps/contacts/templates/index.php')
| -rw-r--r-- | apps/contacts/templates/index.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php index 2ecadb4d60f..44505031c64 100644 --- a/apps/contacts/templates/index.php +++ b/apps/contacts/templates/index.php @@ -13,7 +13,14 @@ </ul> </div> <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>"> - <?php echo $this->inc("part.addcardform"); ?> + <?php + if ($_['id']){ + echo $this->inc("part.details"); + } + else{ + echo $this->inc("part.addcardform"); + } + ?> </div> <!-- Dialogs --> <div id="dialog_holder"></div> |