Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Julian Lam
2017-04-12 23:57:14 -04:00
226 changed files with 211 additions and 10501 deletions

View File

@@ -9,7 +9,7 @@ var plugins = require('../plugins');
var user = require('../user');
var topics = require('../topics');
var categories = require('../categories');
var utils = require('../../public/src/utils');
var utils = require('../utils');
module.exports = function (Posts) {
Posts.create = function (data, callback) {

View File

@@ -11,7 +11,7 @@ var privileges = require('../privileges');
var plugins = require('../plugins');
var cache = require('./cache');
var pubsub = require('../pubsub');
var utils = require('../../public/src/utils');
var utils = require('../utils');
module.exports = function (Posts) {
pubsub.on('post:edit', function (pid) {

View File

@@ -9,7 +9,7 @@ var S = require('string');
var meta = require('../meta');
var cache = require('./cache');
var plugins = require('../plugins');
var translator = require('../../public/src/modules/translator');
var translator = require('../translator');
var urlRegex = /href="([^"]+)"/g;

View File

@@ -9,7 +9,7 @@ var db = require('../database');
var user = require('../user');
var plugins = require('../plugins');
var categories = require('../categories');
var utils = require('../../public/src/utils');
var utils = require('../utils');
module.exports = function (Posts) {

View File

@@ -4,7 +4,7 @@
var async = require('async');
var topics = require('../topics');
var utils = require('../../public/src/utils');
var utils = require('../utils');
module.exports = function (Posts) {
Posts.getPostsFromSet = function (set, start, stop, uid, reverse, callback) {