http://localhost:8080/trac/ticket/728 <p> Bugger just realised that I didn't finish the pull request into the main branch: <a class="ext-link" href="https://trac.transitionnetwork.org/trac/ticket/681"><span class="icon">​</span>https://trac.transitionnetwork.org/trac/ticket/681</a> </p> <p> So the location module patch is not on the live site. </p> <p> I have now done the patch correctly I think: <a class="ext-link" href="https://github.com/transitionnetwork/transitionnetwork.org-d6.profile/pull/2"><span class="icon">​</span>https://github.com/transitionnetwork/transitionnetwork.org-d6.profile/pull/2</a> </p> <p> Shall I additionally add the patch to the live site using Drush as I did before? </p> <p> Thanks </p> <p> Sam </p> en-us /trac/chrome/site/TransitionNetwork-Logo-Web-Small.jpg http://localhost:8080/trac/ticket/728 Trac 0.12.5 paul Tue, 20 May 2014 16:32:39 GMT http://localhost:8080/trac/ticket/728#comment:1 http://localhost:8080/trac/ticket/728#comment:1 <ul> <li><strong>hours</strong> changed from <em>0.0</em> to <em>0.5</em> </li> <li><strong>totalhours</strong> changed from <em>0.0</em> to <em>0.5</em> </li> </ul> <p> @Sam </p> <p> Would you add the patch as you have done previously, and let me know how you made the change, thanks. </p> <p> I have pulled in the changes that I had done earlier for the security update - this resulted in a merge conflict for your patch. I have now resolved this conflict on my local machine, committed locally, pushed, sent a pull request and then pulled. <a class="ext-link" href="https://github.com/transitionnetwork/transitionnetwork.org-d6.profile/blob/master/transitionnetwork.org-d6.make"><span class="icon">​</span>https://github.com/transitionnetwork/transitionnetwork.org-d6.profile/blob/master/transitionnetwork.org-d6.make</a> </p> Ticket sam Thu, 22 May 2014 16:18:04 GMT http://localhost:8080/trac/ticket/728#comment:2 http://localhost:8080/trac/ticket/728#comment:2 <ul> <li><strong>status</strong> changed from <em>new</em> to <em>closed</em> </li> <li><strong>resolution</strong> set to <em>fixed</em> </li> </ul> <p> Great thanks Paul. </p> <p> I have patched the site and all seems to be working correctly again. </p> <p> Thanks </p> <p> Sam </p> Ticket sam Thu, 05 Jun 2014 09:55:01 GMT http://localhost:8080/trac/ticket/728#comment:3 http://localhost:8080/trac/ticket/728#comment:3 <ul> <li><strong>milestone</strong> set to <em>Maintenance</em> </li> </ul> Ticket