diff --git a/protected/modules_core/activity/resources/activies.js b/protected/modules_core/activity/resources/activies.js index 01ebc54030..76351cf6f4 100644 --- a/protected/modules_core/activity/resources/activies.js +++ b/protected/modules_core/activity/resources/activies.js @@ -39,7 +39,7 @@ $(document).ready(function () { if (activityLastEntryReached == false) { // load more activities - loadMore(); + loadMoreActivities(); } } @@ -49,7 +49,7 @@ $(document).ready(function () { /** * load new activities */ - function loadMore() { + function loadMoreActivities() { // save url for activity reloads var _url = activityReloadUrl.replace('lastEntryId', activityLastLoadedEntryId); @@ -92,7 +92,7 @@ $(document).ready(function () { } // load the first activities - loadMore(); + loadMoreActivities(); }); diff --git a/protected/modules_core/notification/views/list/index.php b/protected/modules_core/notification/views/list/index.php deleted file mode 100644 index e55512e0ba..0000000000 --- a/protected/modules_core/notification/views/list/index.php +++ /dev/null @@ -1,26 +0,0 @@ - - - - -