|
Hi,
I got an error while using Meld to view a specific file with the version control browser... I got this message: Invoking 'patch' failed. My Subversion version: selah@selabuntu12_04:~$ svn --version svn, version 1.7.5 (r1336830) compiled Jun 26 2012, 22:33:15 - meld version: '1.5.3' - patch command: 'patch -p0 -R -d /tmp/tmpUa2nkh-meld' selah@selabuntu12_04:~/Shares/iemav_dev$ svn diff --diff-cmd diff application.cfc Index: application.cfc =================================================================== --- application.cfc (revision 73) +++ application.cfc (working copy) @@ -1,12 +1,9 @@ <!--- Application.cfc - + CREATED : Terrence Ryan DESCRIPTION : Application.cfc when present is invoked in lieu of application.cfm and onrequestend.cfm. While applicaition.cfm will still work, this style is preferred. CHANGES: 2007-11-13 ras add error-handling to catch errors thrown by the group management functions - - - ----> <cfcomponent displayname="Application"> @@ -257,21 +254,25 @@ </cfif> <!--- This here handles showing or not showing a page due to the user being logged in. ---> - <cfif IsDefined("session.loggedin")> - <cfif not (session.loggedin) > - <!---<cfif FindNoCase(CGI.SCRIPT_NAME,"group_") eq 0 >---> - <!--- If user is not logged in---> - <cfinvoke component="Application_security" method="login_process" username="" password=""> - <cfabort showerror="NotLoggedIn"> - <!--- Stop display of page. ---> - <!---</cfif>---> - </cfif> - <cfelse> - <!---<cfif FindNoCase(CGI.SCRIPT_NAME,"group_") eq 0 >---> - <cfinvoke component="Application_security" method="login_process" username="" password=""> - <cfabort showerror="NotLoggedIn"> - <!---</cfif>---> - </cfif> +<!--- <cfif FindNoCase("LTI", "#cgi.SCRIPT_NAME#") EQ 0>---> + <cfif FindNoCase("LTI", cgi.SCRIPT_NAME) EQ 0> + <cfif IsDefined("session.loggedin")> + <cfif not (session.loggedin) > + <!---<cfif FindNoCase(CGI.SCRIPT_NAME,"group_") eq 0 >---> + <!--- If user is not logged in---> + <cfinvoke component="Application_security" method="login_process" username="" password=""> + <cfabort showerror="NotLoggedIn"> + <!--- Stop display of page. ---> + <!---</cfif>---> + </cfif> + <cfelse> + <!---<cfif FindNoCase(CGI.SCRIPT_NAME,"group_") eq 0 >---> + <cfinvoke component="Application_security" method="login_process" username="" password=""> + <cfabort showerror="NotLoggedIn"> + <!---</cfif>---> + </cfif> + + </cfif> </cffunction> <!--- *********************************************************** ---> Selah Lynch
Programmer Analyst The Alfred West Jr. Learning Lab http://www.wharton.upenn.edu/learning 267-639-8845 |