← Back to branch summary

~ubuntu-dev/ubuntu/lucid/zabbix/lucid-201002110857

« back to all changes in this revision

Viewing changes to frontends/php/include/media.inc.php

  • Committer: Bazaar Package Importer
  • Author(s): Stephan Hermann
  • Date: 2008-06-04 09:22:37 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080604092237-zgwq7kmraj1oohoz
Tags: 1:1.4.5-1ubuntu1
https://launchpad.net/bugs/172775
* Merge from debian unstable, remaining changes: 
  + fixing missing pid directory in /var/run
* Added the same patch to debian/zabbix-server-{mysql,pgsql}.zabbix-server.init
  (LP: #172775)

Show diffs side-by-side

added added

removed removed

Lines of Context:
frontends/php/include/media.inc.php
120
120
        {
121
121
                $ret = 0;
122
122
 
123
 
                $sql="select * from media_type where description=".zbx_dbstr($description)." and mediatypeid!=$mediatypeid";
 
123
                $sql="select * from media_type where description=".zbx_dbstr($description)." and mediatypeid<>$mediatypeid";
124
124
                $result=DBexecute($sql);
125
125
                if(DBfetch($result))
126
126
                {