diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-03-30 19:17:27 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-03-30 19:17:27 +0200 |
| commit | 5f974c2567091412f4e98cad2a31e882e14cac9b (patch) | |
| tree | 0561137e90c9d03d4e318ea8847dd82444d9b9f4 /app/layout/aside_feed.phtml | |
| parent | 19517baf13dba7ebd7d41dbbacceaea3ed75af8e (diff) | |
| parent | 34b17b748efb996f0202815dcf095a45d28e38da (diff) | |
Merge branch '163-export' into dev
Conflicts:
app/layout/aside_feed.phtml
Diffstat (limited to 'app/layout/aside_feed.phtml')
| -rw-r--r-- | app/layout/aside_feed.phtml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index 7a5b2ce5e..aac15d741 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -49,7 +49,7 @@ </a> </li> - <li class="item<?php echo Minz_Request::actionName () == 'importExport' ? ' active' : ''; ?>"> + <li class="item<?php echo Minz_Request::controllerName () == 'importExport' ? ' active' : ''; ?>"> <a href="<?php echo _url ('importExport', 'index'); ?>"><?php echo Minz_Translate::t ('import_export'); ?></a> </li> @@ -62,7 +62,7 @@ <?php if (!empty ($this->feeds)) { ?> <?php foreach ($this->feeds as $feed) { ?> <?php $nbEntries = $feed->nbEntries (); ?> - <li class="item<?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? ' active' : ''; ?><?php echo $feed->inError () ? ' error' : ''; ?><?php echo $nbEntries == 0 ? ' empty' : ''; ?>"> + <li class="item<?php echo (isset($this->flux) && $this->flux->id () == $feed->id ()) ? ' active' : ''; ?><?php echo $feed->inError () ? ' error' : ''; ?><?php echo $nbEntries == 0 ? ' empty' : ''; ?>"> <a href="<?php echo _url ('configure', 'feed', 'id', $feed->id ()); ?>"> <img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" /> <?php echo $feed->name (); ?> |