← Back to branch summary

~ubuntu-branches/ubuntu/lucid/phpmyadmin/lucid

« back to all changes in this revision

Viewing changes to libraries/engines/merge.lib.php

  • Committer: Bazaar Package Importer
  • Author(s): Michal Čihař
  • Date: 2009-06-30 14:05:13 UTC
  • mfrom: (1.2.1 upstream) (36.1.2 karmic)
  • Revision ID: james.westby@ubuntu.com-20090630140513-hz71do3sij2jhm4s
https://launchpad.net/bugs/388703
https://launchpad.net/bugs/369244
http://bugs.debian.org/534894
* New upstream version fixing XSS (PMASA-2009-5).
* Document no empty password in README.Debian and the shipped sample
  configuration file (LP: #388703).
* Install service file for avahi (if web service enabled and if avahi is
  installed) (LP: #369244).
* Mention protecting of setup if not using provided configuration snippets
  for webservers.
* Call ucf with --debconf-ok in postrm (Closes: #534894).

Show diffs side-by-side

added added

removed removed

Lines of Context:
libraries/engines/merge.lib.php
1
1
<?php
2
2
/* vim: set expandtab sw=4 ts=4 sts=4: */
3
3
/**
4
 
 * @version $Id: merge.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
 
4
 * @version $Id: merge.lib.php 11981 2008-11-24 10:18:44Z nijel $
 
5
 * @package phpMyAdmin-Engines
5
6
 */
6
7
 
7
8
/**
8
9
 *
 
10
 * @package phpMyAdmin-Engines
9
11
 */
10
12
class PMA_StorageEngine_merge extends PMA_StorageEngine
11
13
{