hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add prod refactor

Browse Source 
Fix issue

Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Share.php
	lib/Alchemy/Phrasea/Controller/User/Notifications.php
	lib/Alchemy/Phrasea/Controller/User/Preferences.php
	templates/web/common/dialog_export.html.twig
This commit is contained in:
Nicolas Le Goff
2012-10-09 19:50:10 +02:00
parent b95954791e
commit cde9ce18ae
13 changed files with 1282 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/eventsmanager/broker.class.php
View File

@@ -203,7 +203,7 @@ class eventsmanager_broker
$data['next'] = '<a href="#" onclick="print_notifications(' . ((int) $page + 1) . ');return false;">' . _('charger d\'avantages de notifications') . '</a>';
}
return p4string::jsonencode($datas);
return p4string::jsonencode($data);
}
public function get_unread_notifications_number()