Merge pull request #1300 from Alkarex/share-string-replace-global

Fix bug share
pull/1302/head
Alexandre Alapetite 8 years ago committed by GitHub
commit cdd01c3d28
  1. 2
      app/Controllers/configureController.php
  2. 8
      p/scripts/main.js

@ -139,7 +139,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
*/
public function sharingAction() {
if (Minz_Request::isPost()) {
$params = Minz_Request::fetchGET();
$params = Minz_Request::fetchPOST();
FreshRSS_Context::$user_conf->sharing = $params['share'];
FreshRSS_Context::$user_conf->save();
invalidateHttpCache();

@ -1153,10 +1153,10 @@ function init_share_observers() {
$('.share.add').on('click', function(e) {
var opt = $(this).siblings('select').find(':selected');
var row = $(this).parents('form').data(opt.data('form'));
row = row.replace('##label##', opt.html().trim(), 'g');
row = row.replace('##type##', opt.val(), 'g');
row = row.replace('##help##', opt.data('help'), 'g');
row = row.replace('##key##', shares, 'g');
row = row.replace(/##label##/g, opt.html().trim());
row = row.replace(/##type##/g, opt.val());
row = row.replace(/##help##/g, opt.data('help'));
row = row.replace(/##key##/g, shares);
$(this).parents('.form-group').before(row);
shares++;

Loading…
Cancel
Save