Merge branch '2.3.x' into devel
This commit is contained in:
commit
ec159131a8
57 changed files with 4238 additions and 429 deletions
|
@ -42,7 +42,7 @@ if (isset($this->obj)) {
|
|||
<a id="playlist_name_display" contenteditable="true">
|
||||
<?php
|
||||
if (isset($this->unsavedName)) echo $this->unsavedName;
|
||||
else echo $this->obj->getName();
|
||||
else echo $this->escape($this->obj->getName());
|
||||
?>
|
||||
</a>
|
||||
</h3>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue