Merge pull request #9755 from mrclay/merge112

Merge 1.12 into 2.0
Elgg · Apr 21, 2016 · 544dd73 · 544dd73
2 parents 425cf0d + e8a51ae
commit 544dd73
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/engine/classes/Elgg/ClassMap.php b/engine/classes/Elgg/ClassMap.php
@@ -44,8 +44,10 @@ public function setPath($class, $path) {
 		if ('\\' === $class[0]) {
 			$class = substr($class, 1);
 		}
-		$this->map[$class] = $path;
-		$this->altered = true;
+		if (!isset($this->map[$class]) || $this->map[$class] !== $path) {
+			$this->map[$class] = $path;
+			$this->altered = true;
+		}
 		return $this;
 	}
 

diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php
@@ -95,5 +95,6 @@
 	'file:downloadfailed' => "Sorry; this file is not available at this time.",
 	'file:deletefailed' => "Your file could not be deleted at this time.",
 	'file:noaccess' => "You do not have permissions to change this file",
+	'file:cannotload' => "There was an error uploading the file",
 	'file:nofile' => "You must select a file",
 );
diff --git a/views/default/page/layouts/error.php b/views/default/page/layouts/error.php
@@ -12,5 +12,6 @@
 	$class = "$class {$vars['class']}";
 }
 $vars['class'] = $class;
+$vars['nav'] = ''; // prevents outputting breadcrumbs
 
 echo elgg_view('page/layouts/one_column', $vars);