Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Squashed commit of the following:

commit 41d379c
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Jul 21 00:10:10 2011 -0600

    Replace an overly-complicated regular expression with a simple in_array, at Bharat's suggestion.

commit 1b3f711
Merge: 8f7904a 403f64b
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Jul 20 21:02:56 2011 -0600

    Merge branch 'master' into rawphoto

commit 403f64b
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Tue Jul 12 21:44:14 2011 -0700

    Automated update of .build_number to 163 for branch master
    Last update: e8382b9 (1 commits ago)

commit 51726f9
Author: Tim Almdal <tnalmdal@shaw.ca>
Date:   Tue Jul 12 21:44:40 2011 -0700

    Fix for ticket #1752.  Add an RSS field link for the current album. Or, in the case of a photo or movie, add a link to the rss field of the parent album.

commit e8382b9
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Mon Jun 27 22:27:04 2011 -0700

    Automated update of .build_number to 162 for branch master
    Last update: 40cda7f (1 commits ago)

commit 1afbcaf
Merge: 40cda7f fc6c139
Author: Bharat Mediratta <bharat@menalto.com>
Date:   Mon Jun 27 22:26:41 2011 -0700

    Merge pull request #56 from alindeman/alindeman/1758

    [Fixes #1758] Link to themes codex page instead of modules codex page

commit 40cda7f
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Mon Jun 27 22:25:54 2011 -0700

    Automated update of .build_number to 161 for branch master
    Last update: 771de0a3746ac0d780cb5dce2a14aa5a6ddf06d7 (1 commits ago)

commit aa08df7f0a839c95d268853cd745f622c98cadd0
Merge: 771de0a 784c429
Author: Bharat Mediratta <bharat@menalto.com>
Date:   Mon Jun 27 22:25:46 2011 -0700

    Merge pull request #55 from alindeman/alindeman/1757

    [Fixes #1757] Redirect to root album if path comes in as main.php or index.php

commit fc6c1390d3d5f3d99d75b04acf208ae3729c11ce
Author: Andy Lindeman <alindeman@gmail.com>
Date:   Mon Jun 27 08:25:50 2011 -0400

    [Fixes #1758] Link to themes codex page instead of modules codex page

commit 784c429070db54e183feb3e0ea6f2726b6507081
Author: Andy Lindeman <alindeman@gmail.com>
Date:   Mon Jun 27 07:24:37 2011 -0400

    [Fixes #1757] Redirect to root album if path comes in as main.php or index.php

commit 8f7904ab62c71a7e4ee68762f936030b4dcb4ea1
Merge: e950573 771de0a
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Jun 25 14:12:39 2011 -0600

    Merge branches 'master' and 'rawphoto' into rawphoto

commit e95057337996351e49915d9f85d007d50103a4be
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Jun 15 20:24:18 2011 -0600

    Merge branches 'rawphoto-squash' and 'rawphoto' into rawphoto
  • Loading branch information...
commit 44b624f6fbc34cbc638afa1c2a1f6cb0ae154a03 1 parent 521a682
Chad Parry chadparry authored
2  .build_number
@@ -3,4 +3,4 @@
3 3 ; process. You don't need to edit it. In fact..
4 4 ;
5 5 ; DO NOT EDIT THIS FILE BY HAND!
6   -build_number=160
  6 +build_number=163
2  modules/g2_import/controllers/g2.php
@@ -34,7 +34,7 @@ public function map() {
34 34 $path = $input->get("path");
35 35 $id = $input->get("g2_itemId");
36 36
37   - if ($path || $id) {
  37 + if (($path && $path != 'index.php' && $path != 'main.php') || $id) {
38 38 if ($id) {
39 39 // Requests by id are either core.DownloadItem or core.ShowItem requests. Later versions of
40 40 // Gallery 2 don't specify g2_view if it's the default (core.ShowItem). And in some cases
8 modules/gallery/helpers/gallery_rss.php
@@ -21,6 +21,14 @@
8 modules/gallery/models/item.php
@@ -805,13 +805,9 @@ public function valid_name(Validation $v, $field) {
4 modules/gallery/views/admin_themes.html.php
@@ -48,7 +48,7 @@ function() { load(type) });
@@ -88,7 +88,7 @@ function() { load(type) });

0 comments on commit 44b624f

Please sign in to comment.
Something went wrong with that request. Please try again.