From d5953e5c33be1a2d8341101c67e4b40cb95b0c7f Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Thu, 31 Mar 2022 14:30:40 +0200
Subject: cache internalpath in versions cleanup

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 apps/files_versions/lib/Storage.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'apps/files_versions')

diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index a6674ab244b..3f91e32ef95 100644
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -543,9 +543,10 @@ class Storage {
 		});
 
 		foreach ($versions as $version) {
-			\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $version->getInternalPath(), 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
+			$internalPath = $version->getInternalPath();
+			\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $internalPath, 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
 			$version->delete();
-			\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $version->getInternalPath(), 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
+			\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $internalPath, 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
 		}
 	}
 
-- 
cgit v1.2.3

tion value='branch-10.3'>branch-10.3</option>
<option value='branch-10.4'>branch-10.4</option>
<option value='branch-10.5'>branch-10.5</option>
<option value='branch-10.6'>branch-10.6</option>
<option value='branch-10.7'>branch-10.7</option>
<option value='branch-10.8'>branch-10.8</option>
<option value='branch-25.01'>branch-25.01</option>
<option value='branch-25.1'>branch-25.1</option>
<option value='branch-5.6'>branch-5.6</option>
<option value='branch-6.0'>branch-6.0</option>
<option value='branch-6.1'>branch-6.1</option>
<option value='branch-6.2'>branch-6.2</option>
<option value='branch-6.3'>branch-6.3</option>
<option value='branch-6.4'>branch-6.4</option>
<option value='branch-6.5'>branch-6.5</option>
<option value='branch-6.5-M1'>branch-6.5-M1</option>
<option value='branch-6.6'>branch-6.6</option>
<option value='branch-6.6-M1'>branch-6.6-M1</option>
<option value='branch-6.7'>branch-6.7</option>
<option value='branch-7.0'>branch-7.0</option>
<option value='branch-7.9'>branch-7.9</option>
<option value='branch-8.1'>branch-8.1</option>
<option value='branch-8.3'>branch-8.3</option>
<option value='branch-8.4'>branch-8.4</option>
<option value='branch-8.5'>branch-8.5</option>
<option value='branch-8.6'>branch-8.6</option>
<option value='branch-8.7'>branch-8.7</option>
<option value='branch-8.9'>branch-8.9</option>
<option value='branch-9.0'>branch-9.0</option>
<option value='branch-9.1'>branch-9.1</option>
<option value='branch-9.2'>branch-9.2</option>
<option value='branch-9.3'>branch-9.3</option>
<option value='branch-9.4'>branch-9.4</option>
<option value='branch-9.5'>branch-9.5</option>
<option value='branch-9.6'>branch-9.6</option>
<option value='branch-9.7'>branch-9.7</option>
<option value='branch-9.8'>branch-9.8</option>
<option value='branch-9.9'>branch-9.9</option>
<option value='bug/cv/SONAR-20986-open-source-build-on-travis-failing'>bug/cv/SONAR-20986-open-source-build-on-travis-failing</option>
<option value='bugfix/cv/upgrade-travisenv-j17'>bugfix/cv/upgrade-travisenv-j17</option>
<option value='copy_of_master'>copy_of_master</option>
<option value='docs/th/AzureExtensionCompat15621'>docs/th/AzureExtensionCompat15621</option>
<option value='feat/smarini/BUILD-6088-add-security-md'>feat/smarini/BUILD-6088-add-security-md</option>
<option value='feature/jay/fix-travis-build'>feature/jay/fix-travis-build</option>
<option value='feature/jh/scanner_report_uploader'>feature/jh/scanner_report_uploader</option>
<option value='feature/wad/do-not-merge-do-not-merge'>feature/wad/do-not-merge-do-not-merge</option>
<option value='feature/wad/refresh-cache'>feature/wad/refresh-cache</option>
<option value='feature/wad/wip-node-18'>feature/wad/wip-node-18</option>
<option value='fix/jp/fix-jrog'>fix/jp/fix-jrog</option>
<option value='greg/test-new-cirrus-config'>greg/test-new-cirrus-config</option>
<option value='jp/test-ut'>jp/test-ut</option>
<option value='lj/testing-release'>lj/testing-release</option>
<option value='lj/travis-fix-for-master'>lj/travis-fix-for-master</option>
<option value='master' selected='selected'>master</option>
<option value='ms/test-timeout'>ms/test-timeout</option>
<option value='poc/kirill+dam/open-issue-in-ide'>poc/kirill+dam/open-issue-in-ide</option>
<option value='poc/me/travis-public-repo'>poc/me/travis-public-repo</option>
<option value='prevent-jvm-override'>prevent-jvm-override</option>
<option value='task/mm/restore-public-build'>task/mm/restore-public-build</option>
<option value='task/sma/SONAR-22676_DO-NOT-MERGE'>task/sma/SONAR-22676_DO-NOT-MERGE</option>
<option value='wip/ak/BUILD-3755-test-pr'>wip/ak/BUILD-3755-test-pr</option>
<option value='wip/ant1/try_BUILD-3755_no_public_build_for_lts'>wip/ant1/try_BUILD-3755_no_public_build_for_lts</option>
<option value='wouter-admiraal-sonarsource-patch-1'>wouter-admiraal-sonarsource-patch-1</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Continuous Inspection: https://github.com/SonarSource/sonarqube</td><td class='sub right'>www-data</td></tr></table>
<table class='tabs'><tr><td>
<a href='/sonarqube.git/about/'>about</a><a href='/sonarqube.git/'>summary</a><a href='/sonarqube.git/refs/?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>refs</a><a href='/sonarqube.git/log/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx'>log</a><a class='active' href='/sonarqube.git/tree/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>tree</a><a href='/sonarqube.git/commit/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>commit</a><a href='/sonarqube.git/diff/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>diff</a><a href='/sonarqube.git/stats/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx'>stats</a></td><td class='form'><form class='right' method='get' action='/sonarqube.git/log/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx'>
<input type='hidden' name='id' value='7ae6f6f0968febebf763cf073b09cb6dd2b218d7'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/sonarqube.git/tree/?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>root</a>/<a href='/sonarqube.git/tree/server?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>server</a>/<a href='/sonarqube.git/tree/server/sonar-web?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>sonar-web</a>/<a href='/sonarqube.git/tree/server/sonar-web/src?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>src</a>/<a href='/sonarqube.git/tree/server/sonar-web/src/main?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>main</a>/<a href='/sonarqube.git/tree/server/sonar-web/src/main/js?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>js</a>/<a href='/sonarqube.git/tree/server/sonar-web/src/main/js/app?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>app</a>/<a href='/sonarqube.git/tree/server/sonar-web/src/main/js/app/components?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>components</a>/<a href='/sonarqube.git/tree/server/sonar-web/src/main/js/app/components/nav?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>nav</a>/<a href='/sonarqube.git/tree/server/sonar-web/src/main/js/app/components/nav/global?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>global</a>/<a href='/sonarqube.git/tree/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>GlobalNavMenu.tsx</a></div><div class='content'>blob: 1c8b5f114485d071807e5cf3b1429d24b6301b75 (<a href='/sonarqube.git/plain/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx?id=7ae6f6f0968febebf763cf073b09cb6dd2b218d7'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
<a id='n13' href='#n13'>13</a>
<a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
<a id='n16' href='#n16'>16</a>
<a id='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
<a id='n19' href='#n19'>19</a>
<a id='n20' href='#n20'>20</a>
<a id='n21' href='#n21'>21</a>
<a id='n22' href='#n22'>22</a>
<a id='n23' href='#n23'>23</a>
<a id='n24' href='#n24'>24</a>
<a id='n25' href='#n25'>25</a>
<a id='n26' href='#n26'>26</a>
<a id='n27' href='#n27'>27</a>
<a id='n28' href='#n28'>28</a>
<a id='n29' href='#n29'>29</a>
<a id='n30' href='#n30'>30</a>
<a id='n31' href='#n31'>31</a>
<a id='n32' href='#n32'>32</a>
<a id='n33' href='#n33'>33</a>
<a id='n34' href='#n34'>34</a>
<a id='n35' href='#n35'>35</a>
<a id='n36' href='#n36'>36</a>
<a id='n37' href='#n37'>37</a>
<a id='n38' href='#n38'>38</a>
<a id='n39' href='#n39'>39</a>
<a id='n40' href='#n40'>40</a>
<a id='n41' href='#n41'>41</a>
<a id='n42' href='#n42'>42</a>
<a id='n43' href='#n43'>43</a>
<a id='n44' href='#n44'>44</a>
<a id='n45' href='#n45'>45</a>
<a id='n46' href='#n46'>46</a>
<a id='n47' href='#n47'>47</a>
<a id='n48' href='#n48'>48</a>
<a id='n49' href='#n49'>49</a>
<a id='n50' href='#n50'>50</a>
<a id='n51' href='#n51'>51</a>
<a id='n52' href='#n52'>52</a>
<a id='n53' href='#n53'>53</a>
<a id='n54' href='#n54'>54</a>
<a id='n55' href='#n55'>55</a>
<a id='n56' href='#n56'>56</a>
<a id='n57' href='#n57'>57</a>
<a id='n58' href='#n58'>58</a>
<a id='n59' href='#n59'>59</a>
<a id='n60' href='#n60'>60</a>
<a id='n61' href='#n61'>61</a>
<a id='n62' href='#n62'>62</a>
<a id='n63' href='#n63'>63</a>
<a id='n64' href='#n64'>64</a>
<a id='n65' href='#n65'>65</a>
<a id='n66' href='#n66'>66</a>
<a id='n67' href='#n67'>67</a>
<a id='n68' href='#n68'>68</a>
<a id='n69' href='#n69'>69</a>
<a id='n70' href='#n70'>70</a>
<a id='n71' href='#n71'>71</a>
<a id='n72' href='#n72'>72</a>
<a id='n73' href='#n73'>73</a>
<a id='n74' href='#n74'>74</a>
<a id='n75' href='#n75'>75</a>
<a id='n76' href='#n76'>76</a>
<a id='n77' href='#n77'>77</a>
<a id='n78' href='#n78'>78</a>
<a id='n79' href='#n79'>79</a>
<a id='n80' href='#n80'>80</a>
<a id='n81' href='#n81'>81</a>
<a id='n82' href='#n82'>82</a>
<a id='n83' href='#n83'>83</a>
<a id='n84' href='#n84'>84</a>
<a id='n85' href='#n85'>85</a>
<a id='n86' href='#n86'>86</a>
<a id='n87' href='#n87'>87</a>
<a id='n88' href='#n88'>88</a>
<a id='n89' href='#n89'>89</a>
<a id='n90' href='#n90'>90</a>
<a id='n91' href='#n91'>91</a>
<a id='n92' href='#n92'>92</a>
<a id='n93' href='#n93'>93</a>
<a id='n94' href='#n94'>94</a>
<a id='n95' href='#n95'>95</a>
<a id='n96' href='#n96'>96</a>
<a id='n97' href='#n97'>97</a>
<a id='n98' href='#n98'>98</a>
<a id='n99' href='#n99'>99</a>
<a id='n100' href='#n100'>100</a>
<a id='n101' href='#n101'>101</a>
<a id='n102' href='#n102'>102</a>
<a id='n103' href='#n103'>103</a>
<a id='n104' href='#n104'>104</a>
<a id='n105' href='#n105'>105</a>
<a id='n106' href='#n106'>106</a>
<a id='n107' href='#n107'>107</a>
<a id='n108' href='#n108'>108</a>
<a id='n109' href='#n109'>109</a>
<a id='n110' href='#n110'>110</a>
<a id='n111' href='#n111'>111</a>
<a id='n112' href='#n112'>112</a>
<a id='n113' href='#n113'>113</a>
<a id='n114' href='#n114'>114</a>
<a id='n115' href='#n115'>115</a>
<a id='n116' href='#n116'>116</a>
<a id='n117' href='#n117'>117</a>
<a id='n118' href='#n118'>118</a>
<a id='n119' href='#n119'>119</a>
<a id='n120' href='#n120'>120</a>
<a id='n121' href='#n121'>121</a>
<a id='n122' href='#n122'>122</a>
<a id='n123' href='#n123'>123</a>
<a id='n124' href='#n124'>124</a>
<a id='n125' href='#n125'>125</a>
<a id='n126' href='#n126'>126</a>
<a id='n127' href='#n127'>127</a>
<a id='n128' href='#n128'>128</a>
<a id='n129' href='#n129'>129</a>
<a id='n130' href='#n130'>130</a>
<a id='n131' href='#n131'>131</a>
<a id='n132' href='#n132'>132</a>
<a id='n133' href='#n133'>133</a>
<a id='n134' href='#n134'>134</a>
<a id='n135' href='#n135'>135</a>
<a id='n136' href='#n136'>136</a>
<a id='n137' href='#n137'>137</a>
<a id='n138' href='#n138'>138</a>
<a id='n139' href='#n139'>139</a>
<a id='n140' href='#n140'>140</a>
<a id='n141' href='#n141'>141</a>
<a id='n142' href='#n142'>142</a>
<a id='n143' href='#n143'>143</a>
<a id='n144' href='#n144'>144</a>
<a id='n145' href='#n145'>145</a>
<a id='n146' href='#n146'>146</a>
<a id='n147' href='#n147'>147</a>
<a id='n148' href='#n148'>148</a>
<a id='n149' href='#n149'>149</a>
<a id='n150' href='#n150'>150</a>
<a id='n151' href='#n151'>151</a>
<a id='n152' href='#n152'>152</a>
<a id='n153' href='#n153'>153</a>
<a id='n154' href='#n154'>154</a>
<a id='n155' href='#n155'>155</a>
<a id='n156' href='#n156'>156</a>
<a id='n157' href='#n157'>157</a>
<a id='n158' href='#n158'>158</a>
<a id='n159' href='#n159'>159</a>
<a id='n160' href='#n160'>160</a>
<a id='n161' href='#n161'>161</a>
<a id='n162' href='#n162'>162</a>
<a id='n163' href='#n163'>163</a>
<a id='n164' href='#n164'>164</a>
<a id='n165' href='#n165'>165</a>
<a id='n166' href='#n166'>166</a>
<a id='n167' href='#n167'>167</a>
<a id='n168' href='#n168'>168</a>
<a id='n169' href='#n169'>169</a>
<a id='n170' href='#n170'>170</a>
<a id='n171' href='#n171'>171</a>
<a id='n172' href='#n172'>172</a>
<a id='n173' href='#n173'>173</a>
<a id='n174' href='#n174'>174</a>
<a id='n175' href='#n175'>175</a>
<a id='n176' href='#n176'>176</a>
<a id='n177' href='#n177'>177</a>
<a id='n178' href='#n178'>178</a>
<a id='n179' href='#n179'>179</a>
<a id='n180' href='#n180'>180</a>
<a id='n181' href='#n181'>181</a>
<a id='n182' href='#n182'>182</a>
<a id='n183' href='#n183'>183</a>
<a id='n184' href='#n184'>184</a>
<a id='n185' href='#n185'>185</a>
<a id='n186' href='#n186'>186</a>
<a id='n187' href='#n187'>187</a>
<a id='n188' href='#n188'>188</a>
<a id='n189' href='#n189'>189</a>
<a id='n190' href='#n190'>190</a>
<a id='n191' href='#n191'>191</a>
<a id='n192' href='#n192'>192</a>
<a id='n193' href='#n193'>193</a>
</pre></td>
<td class='lines'><pre><code>