WordPress.org
Get WordPress

Plugin Directory

Changeset 1706140


Ignore:
Timestamp:
08/01/2017 07:58:53 AM (9 years ago)
Author:
vashkatsi
Message:

1.0.6

Location:
bbq/tags/1.0.6
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • bbq/tags/1.0.6/includes/BbqBlockPosition.php

    r1705761 r1706140  
    1818    const NONE = 'none';
    1919
    20     public static function getInPostPositionNumber($position)
     20    public static function getPositionNumber($position)
    2121    {
    2222        switch ($position) {
    … …  
    3535            case self::SEVENTH_IN_POST:
    3636                return 7;
     37            case self::BEFORE_POST:
     38                return 100;
     39            case self::AFTER_POST:
     40                return 101;
     41            case self::SIDEBAR:
     42                return 200;
    3743            default:
    3844                return 0;

  • bbq/tags/1.0.6/includes/BbqOption.php

    r1705764 r1706140  
    3131        $blocks = json_decode($blocks);
    3232        for ($i = 0; $i < count($blocks); $i++) {
    33             $blocks[$i]->inPostPositionNumber = BbqBlockPosition::getInPostPositionNumber($blocks[$i]->blockPosition);
     33            $blocks[$i]->positionNumber = BbqBlockPosition::getPositionNumber($blocks[$i]->blockPosition);
    3434        }
    35         $inPostPositionNumber = [];
     35        $positionNumber = [];
    3636        $blockPositionPriority = [];
    3737        foreach ($blocks as $key => $row) {
    38             $inPostPositionNumber[$key] = (int)$row->inPostPositionNumber;
     38            $positionNumber[$key] = (int)$row->positionNumber;
    3939            $blockPositionPriority[$key] = (int)$row->blockPositionPriority;
    4040        }
    41         array_multisort($inPostPositionNumber, SORT_DESC, $blockPositionPriority, SORT_ASC, $blocks);
     41        array_multisort($positionNumber, SORT_DESC, $blockPositionPriority, SORT_DESC, $blocks);
    4242
    4343        return $blocks;

  • bbq/tags/1.0.6/public/class-bbq-public.php

    r1705764 r1706140  
    168168
    169169            $paragraphsCounter = count(explode('</p>', $content));
     170            $beforePost = '';
    170171            foreach ($blocks as $block) {
    171172
    … …  
    185186
    186187                if($block->blockPosition === BbqBlockPosition::BEFORE_POST) {
    187                     $content = $block->blockDiv . $content;
     188                    $beforePost .= $block->blockDiv;
    188189                }
    189190                if($block->blockPosition === BbqBlockPosition::AFTER_POST) {
    … …  
    220221                }
    221222            }
     223            $content = $beforePost . $content;
    222224        }
    223225
Note: See TracChangeset for help on using the changeset viewer.