diff options
| author | rvelices <rv-github@modusoptimus.com> | 2009-01-22 02:19:17 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2009-01-22 02:19:17 +0000 |
| commit | fef4f255b5c91e1caa862c99b2afd8d94eca2cc8 (patch) | |
| tree | 411978bbdfa4d931a2b25e20a1020e63838e361a | |
| parent | 5865b1e90bd29b3c1d02933446f715400e35dfc9 (diff) | |
- fix hard coded urls in section_init
- moved a language string language from php to tpl
git-svn-id: http://piwigo.org/svn/trunk@3108 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | include/section_init.inc.php | 12 | ||||
| -rw-r--r-- | template/yoga/index.tpl | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/include/section_init.inc.php b/include/section_init.inc.php index fd93b4fea..e6eac34f3 100644 --- a/include/section_init.inc.php +++ b/include/section_init.inc.php @@ -380,17 +380,16 @@ SELECT DISTINCT image_id ) ); - if (!empty($_GET['action']) - && ($_GET['action'] == 'remove_all_from_favorites')) + if (!empty($_GET['action']) && ($_GET['action'] == 'remove_all_from_favorites')) { $query = ' DELETE FROM '.FAVORITES_TABLE.' WHERE user_id = '.$user['id'].' ;'; pwg_query($query); - redirect('index.php?/favorites'); + redirect(make_index_url( array('section'=>'favorites') )); } - else + else { $query = ' SELECT image_id @@ -414,16 +413,15 @@ SELECT image_id ) ); - if (count($page['items'])>0) + if (count($page['items'])>0) { $template->assign( 'favorite', array( 'FAVORITE_IMG' => get_root_url().get_themeconf('icon_dir').'/del_all_favorites.png', - 'FAVORITE_HINT' => l10n('del_all_favorites_hint'), 'U_FAVORITE' => add_url_params( - 'index.php?/favorites', + make_index_url( array('section'=>'favorites') ), array('action'=>'remove_all_from_favorites') ), ) diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl index 5e65938fe..5a78f9899 100644 --- a/template/yoga/index.tpl +++ b/template/yoga/index.tpl @@ -16,7 +16,7 @@ {/if} {if isset($favorite) } - <li><a href="{$favorite.U_FAVORITE}" title="{$favorite.FAVORITE_HINT}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="favorite" title="{$favorite.FAVORITE_HINT}"></a></li> + <li><a href="{$favorite.U_FAVORITE}" title="{'del_all_favorites_hint'|@translate}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="favorite" title="{'del_all_favorites_hint'|@translate}"></a></li> {/if} {if isset($U_CADDIE) } |