Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Mar 2, 2015
  1. Lincoln Russell

    Merge pull request #2539 from hgtonight/patch-8

    linc authored
    Pass embed discussion data by reference
  2. Zachary Doll

    Pass embed discussion data by reference

    hgtonight authored
    This allows changing the data in event handlers.
  3. Todd Burry

    Merge pull request #2524 from R-J/patch-43

    tburry authored
    Mini performance enhancement for function val()
  4. Todd Burry

    Merge pull request #2104 from R-J/patch-24

    tburry authored
    Fix HTML special char bug
  5. Lincoln Russell

    Merge pull request #2533 from bleistivt/patch-9

    linc authored
    Don't show react button if social reactions are turned off
Commits on Mar 1, 2015
  1. Lincoln Russell

    Fix EmojiExtender

    linc authored
  2. bleistivt

    Don't show react button if social reactions are turned off

    bleistivt authored
    The config option ``Plugins.GooglePlus.SocialReactions`` wasn't respected by the plugin
  3. Lincoln Russell

    Merge pull request #2532 from vanilla/move-2015

    linc authored
    Plugin swap 2015
Commits on Feb 28, 2015
  1. Lincoln Russell

    Plugin swap 2015

    linc authored
  2. Todd Burry
  3. Lincoln Russell

    Merge pull request #2506 from R-J/patch-41

    linc authored
    Strip out unnecessary call to htmlspecialchars
Commits on Feb 27, 2015
  1. Lincoln Russell

    Merge pull request #2529 from vanilla/feature/wall-comment-notifications

    linc authored
    Send notifications on wall comments and other goodies.
  2. Todd Burry

    Merge pull request #2530 from vanilla/hotfix/rss-method

    tburry authored
    Set RSS DelveryType when we detect a feed format
  3. Lincoln Russell
  4. Todd Burry
  5. Todd Burry
  6. Todd Burry
  7. Todd Burry
Commits on Feb 26, 2015
  1. Robin

    Mini performance enhancement for function val()

    R-J authored
    When an array is tested for a non existing $key, the current behavior also checked if the array is an object before the default value was returned. Nesting the first if clause brings a performance enhancement. Not too big and only in one special case, but nevertheless!
    
    I've used this script to test:
    
    ~~~
    <?php
    define('ITERATIONS', 3000000);
    
    ini_set('display_errors', 1);
    ini_set('track_errors', 1);
    
    function val($key, $collection, $default = false) {
        if (is_array($collection) && array_key_exists($key, $collection)) {
            return $collection[$key];
        } elseif (is_object($collection) && property_exists($collection, $key)) {
            return $collection->$key;
        }
        return $default;
    }
    
    function value ($key, $collection, $default = false) {
        if (is_array($collection)) {
            if (array_key_exists($key, $collection)) {
                return $collection[$key];
            } else {
                return $default;
            }
        } elseif (is_object($collection) && property_exists($collection, $key)) {
            return $collection->$key;
        }
        return $default;
    }
    
    $json = '{"Discussion":{"DiscussionID":29415,"Type":null,"ForeignID":null,"CategoryID":36,"InsertUserID":58653,"UpdateUserID":58653,"FirstCommentID":null,"LastCommentID":null,"Name":"Award Badges afterward","Body":"Hi,\r\n\r\nmy board is growing and now I want to award some users with a Badge.\r\nIs there a possibility to award the Badge automatically to the users which meet the requirements?","Format":"Markdown","Tags":[],"CountComments":0,"CountBookmarks":null,"CountViews":7,"Closed":0,"Announce":0,"Sink":0,"DateInserted":"2015-02-26 10:32:11","DateUpdated":"2015-02-26 10:33:08","DateLastComment":"2015-02-26 10:32:11","LastCommentUserID":null,"Score":null,"RegardingID":null,"AddonID":1178,"State":null,"LastIP":null,"QnA":null,"DateAccepted":null,"DateOfAnswer":null,"Likes":0,"Spam":0,"Abuse":0,"Source":null,"SourceID":null,"NoIndex":0,"DateLastViewed":"2015-02-26 11:27:24","Dismissed":0,"Bookmarked":0,"CountCommentWatch":0,"Participated":0,"LastDate":"2015-02-26 10:32:11","LastUserID":58653,"LastName":null,"LastPhoto":null,"InsertName":"sadgmbh","InsertPhoto":"\/\/w2.vanillicon.com\/v2\/22eb31f07194932648cd283f4eadc4f2.svg","Url":"http:\/\/vanillaforums.org\/discussion\/29415\/award-badges-afterward","Category":"Vanilla 2.1 Help","CategoryUrlCode":"vanilla-2-1","PermissionCategoryID":-1,"FirstUserID":58653,"FirstDate":"2015-02-26 10:32:11","CountUnreadComments":0,"Read":true,"UserTags":[],"XTags":[]},"CategoryID":36,"Category":{"CategoryID":36,"ParentCategoryID":-1,"CountDiscussions":1476,"AllowDiscussions":1,"Archived":0,"Archive":0,"Name":"Vanilla 2.1 Help","Description":"","Sort":18,"CssClass":"Category-vanilla-2-1","Photo":null,"PermissionCategoryID":-1,"PointsCategoryID":0,"HideAllDiscussions":0,"DisplayAs":"Discussions","InsertUserID":10878,"UpdateUserID":10878,"DateInserted":"2014-07-27 16:18:46","DateUpdated":"2014-07-27 16:35:02","UrlCode":"vanilla-2-1","TreeLeft":18,"TreeRight":19,"Depth":1,"CountComments":11428,"DateMarkedRead":null,"LastCommentID":226092,"LastDiscussionID":29412,"LastDateInserted":"2015-02-26 10:33:20","AllowedDiscussionTypes":["Discussion","Question"],"DefaultDiscussionType":null,"AllowFileUploads":1,"Type":null,"DateLastComment":"2015-02-26 10:33:20","CountAllDiscussions":1476,"CountAllComments":11428,"Url":"\/\/vanillaforums.org\/categories\/vanilla-2-1","ChildIDs":[],"PhotoUrl":"","LastTitle":"add text between breadcrumbs and topic list","LastUserID":44046,"LastDiscussionUserID":50003,"LastUrl":"\/\/vanillaforums.org\/discussion\/29412\/add-text-between-breadcrumbs-and-topic-list#latest","Unfollow":false,"Following":true,"Read":false,"PermsDiscussionsView":true,"PermsDiscussionsAdd":true,"PermsDiscussionsEdit":false,"PermsCommentsAdd":true},"Comments":[],"Page":1}';
    
    $testObject = json_decode($json);
    $testArray = json_decode($json, true);
    
    
    // init vars
    $CategoryID = 0;
    $time_start = microtime(true);
    $time_end = microtime(true);
    $time = $time_end - $time_start;
    
    for ($i = 0; $i < 3; $i++) {
    
    
    // function val, get non existing from array
    $time_start = microtime(true);
    for ($k = 0; $k < ITERATIONS; $k++) {
        $Quark = val('Quark', $testArray, 'Quatsch');
        // $CategoryID = val('CategoryID', $testArray);
        
    }
    $time_end = microtime(true);
    $time = $time_end - $time_start;
    echo "$time seconds for val/array<br>\n";
    
    // function value, get non existing from array
    $time_start = microtime(true);
    for ($k = 0; $k < ITERATIONS; $k++) {
        $Quark = value('Quark', $testArray, 'Quatsch');
        // $CategoryID = value('CategoryID', $testArray);
    }
    $time_end = microtime(true);
    $time = $time_end - $time_start;
    echo "$time seconds for value/array<br>\n";
    
    echo "<br />\n";
    
    }
    ~~~
  2. Lincoln Russell

    Merge pull request #2492 from vanilla/hotfix/enable-disable-categorie…

    linc authored
    …s-postback
    
    Put the enable/disable category use on a proper authenticated post back endpoint.
  3. Todd Burry

    Merge pull request #2497 from adrianspeyer/patch-23

    tburry authored
    Changes links to create Recpatcha code.
  4. Todd Burry

    Merge pull request #2522 from R-J/patch-42

    tburry authored
    Correct typo: "DateLastVisit" should be "DateLastActive"
Commits on Feb 25, 2015
  1. Lincoln Russell

    Merge pull request #2510 from vanilla/hotfix/mebox-applicant-permission

    linc authored
    Add the proper permission check for the me box's applicants link.
  2. Todd Burry

    Check for applicant approval permission more thoroughly.

    tburry authored
    This fixes the potential bug where a user with only the applicant approval permission will not see the link to applicants.
  3. Lincoln Russell

    Merge pull request #2511 from vanilla/hotfix/tutorial-https

    linc authored
    Make tutorial videos work over https.
  4. Robin

    Correct typo: "DateLastVisit" should be "DateLastActive"

    R-J authored
    UserControllers function _GetFilter() uses the field name "DateLastVisit" which doesn't exist. The field is called "DateLastActive".
    Using `/dashboard/user?Keywords=&Go=Go&Filter=DateLastActive = 2015-01-23 11:46:40` wouldn't work because the filter field "DateLastActive" doesn't exist and therefore the filter is ignored. `/dashboard/user?Keywords=&Go=Go&Filter=DateLastVisit = 2015-01-23 11:46:40` breaks the request because you get a `WHERE user.DateLastVisit..." sql and that column doesn't exist.
    
    But to be honest: I have no clue what this means in practice. You have to use it like that `/dashboard/user?Keywords=&Go=Go&Filter=DateLastActive = 2015-01-23 11:46:40` in order to get results and who wants to filter any date field by such an exact time?
    
    Furthermore I haven't seen any possibility to add a filter to the user list (besides the keywords input box). You have to add `&Filter=Field = Value` manually to the url which is really awkward...
Commits on Feb 21, 2015
  1. Lincoln Russell

    Merge pull request #2513 from bleistivt/patch-8

    linc authored
    UserMetaModel: respect default parameter
  2. bleistivt
Commits on Feb 20, 2015
  1. Todd Burry

    Remove utility/rack.

    tburry authored
  2. Todd Burry
  3. Todd Burry

    Revert "Obey the scheme on the tutorial thumbnails."

    tburry authored
    This reverts commit 8369cf3.
  4. Todd Burry
  5. Todd Burry

    Make tutorial videos work over https.

    tburry authored
    The tutorial videos used http exclusively which gets blocked over https.
  6. Todd Burry
Commits on Feb 18, 2015
  1. Robin

    Strip out unnecessary call to htmlspecialchars

    R-J authored
    Function `Img()` uses function [`Attribute()`](https://github.com/vanilla/vanilla/blob/master/library/core/functions.render.php#L560) 
    to transform the attributes array to html and [that function uses htmlspecialchars](https://github.com/vanilla/vanilla/blob/master/library/core/functions.general.php#L445)
Something went wrong with that request. Please try again.