Skip to content

Commit

Permalink
Merge a1457ae into 3aafd84
Browse files Browse the repository at this point in the history
  • Loading branch information
akagane99 committed Dec 31, 2018
2 parents 3aafd84 + a1457ae commit fbf6ebb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion View/Topics/json/index_plugins.ctp
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ $pluginKey = $this->request->query['plugin_key'];
echo $this->NetCommonsHtml->json(array(
'paging' => $topics[$pluginKey]['paging'],
'topics' => $this->Topics->camelizeKeyRecursive($topics[$pluginKey]['topics'])
));
), 'OK', 200, false);
2 changes: 1 addition & 1 deletion View/Topics/json/index_rooms.ctp
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ $roomId = $this->request->query['room_id'];
echo $this->NetCommonsHtml->json(array(
'paging' => $topics[$roomId]['paging'],
'topics' => $this->Topics->camelizeKeyRecursive($topics[$roomId]['topics'])
));
), 'OK', 200, false);

0 comments on commit fbf6ebb

Please sign in to comment.